From d108a8a41a3ad91067050c9a82fcc9aa8d0d4c09 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 17 May 2019 15:30:56 +0300 Subject: [PATCH 001/357] dependencies cleanup; updated material version --- .../src/main/resources/webapp/angular.json | 11 +- .../main/resources/webapp/package-lock.json | 3131 ++++------------- .../src/main/resources/webapp/package.json | 20 +- .../src/app/reporting/reporting.module.ts | 2 - .../src/main/resources/webapp/src/styles.scss | 3 + 5 files changed, 705 insertions(+), 2462 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/angular.json b/services/self-service/src/main/resources/webapp/angular.json index 7969eb8ad9..1863e34914 100644 --- a/services/self-service/src/main/resources/webapp/angular.json +++ b/services/self-service/src/main/resources/webapp/angular.json @@ -22,11 +22,13 @@ "src/favicon.ico" ], "styles": [ + { + "input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css" + }, "src/styles.scss", - "node_modules/ngx-toastr/toastr.css" + "node_modules/ngx-toastr/toastr.css" ], "scripts": [ - "node_modules/hammerjs/hammer.min.js" ] }, "configurations": { @@ -74,11 +76,12 @@ "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.spec.json", "scripts": [ - "node_modules/hammerjs/hammer.min.js" ], "styles": [ + { + "input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css" + }, "src/styles.scss", - "node_modules/ng2-toastr/bundles/ng2-toastr.min.css", "src/assets/fonts/iconfont/material-icons.css" ], "assets": [ diff --git a/services/self-service/src/main/resources/webapp/package-lock.json b/services/self-service/src/main/resources/webapp/package-lock.json index 602e11911a..3a6aa79457 100644 --- a/services/self-service/src/main/resources/webapp/package-lock.json +++ b/services/self-service/src/main/resources/webapp/package-lock.json @@ -417,24 +417,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, "requires": { @@ -444,12 +448,14 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "1.0.0", @@ -458,34 +464,40 @@ }, "chownr": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "2.6.9", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "optional": true, "requires": { @@ -494,25 +506,29 @@ }, "deep-extend": { "version": "0.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, "requires": { @@ -521,13 +537,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -543,7 +561,8 @@ }, "glob": { "version": "7.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, "requires": { @@ -557,13 +576,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "bundled": true, + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, "requires": { @@ -572,7 +593,8 @@ }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, "requires": { @@ -581,7 +603,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -591,18 +614,21 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { "number-is-nan": "1.0.1" @@ -610,13 +636,15 @@ }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "1.1.11" @@ -624,12 +652,14 @@ }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, "minipass": { "version": "2.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "requires": { "safe-buffer": "5.1.2", @@ -638,7 +668,8 @@ }, "minizlib": { "version": "1.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, "requires": { @@ -647,7 +678,8 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" @@ -655,13 +687,15 @@ }, "ms": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true, "optional": true }, "needle": { "version": "2.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", + "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", "dev": true, "optional": true, "requires": { @@ -672,7 +706,8 @@ }, "node-pre-gyp": { "version": "0.10.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz", + "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==", "dev": true, "optional": true, "requires": { @@ -690,7 +725,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -700,13 +736,15 @@ }, "npm-bundled": { "version": "1.0.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", + "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz", + "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==", "dev": true, "optional": true, "requires": { @@ -716,7 +754,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -728,18 +767,21 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1.0.2" @@ -747,19 +789,22 @@ }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -769,19 +814,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, "requires": { @@ -793,7 +841,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -801,7 +850,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -816,7 +866,8 @@ }, "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, "requires": { @@ -825,42 +876,49 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { "code-point-at": "1.1.0", @@ -870,7 +928,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -879,7 +938,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { "ansi-regex": "2.1.1" @@ -887,13 +947,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, "requires": { @@ -908,13 +970,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, "requires": { @@ -923,12 +987,14 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "yallist": { "version": "3.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true } } @@ -1097,19 +1163,28 @@ } }, "@angular/animations": { - "version": "8.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.0.0-beta.2.tgz", - "integrity": "sha512-Nc6iOJtoUvjKC+yfg+zOZKH/i1J98T+OtBxVSc1usAil21VqhhGyze0/ISsbsYrN4/QH+mH0LMb/tIvPd18hKg==", + "version": "7.2.15", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.15.tgz", + "integrity": "sha512-8oBt3HLgd2+kyJHUgsd7OzKCCss67t2sch15XNoIWlOLfxclqU+EfFE6t/vCzpT8/+lpZS6LU9ZrTnb+UBj5jg==", "requires": { "tslib": "1.9.3" } }, "@angular/cdk": { - "version": "6.4.7", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.4.7.tgz", - "integrity": "sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.3.7.tgz", + "integrity": "sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==", "requires": { + "parse5": "5.1.0", "tslib": "1.9.3" + }, + "dependencies": { + "parse5": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", + "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", + "optional": true + } } }, "@angular/cli": { @@ -1366,20 +1441,11 @@ } }, "@angular/material": { - "version": "6.4.7", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.4.7.tgz", - "integrity": "sha512-SdNx7Xovi24Kw9eU6lkLhY/7f2M7L9F+/uh6XuPr4jbGgCUVVpeeVI5ztZhsZRbj1sN+/r1p5w8u62apWWl5Ww==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.3.7.tgz", + "integrity": "sha512-Eq+7frkeNGkLOfEtmkmJgR+AgoWajOipXZWWfCSamNfpCcPof82DwvGOpAmgGni9FuN2XFQdqP5MoaffQzIvUA==", "requires": { - "parse5": "5.1.0", "tslib": "1.9.3" - }, - "dependencies": { - "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", - "optional": true - } } }, "@angular/material-moment-adapter": { @@ -1506,12 +1572,6 @@ } } }, - "@types/jasmine": { - "version": "2.5.38", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.38.tgz", - "integrity": "sha1-pDeRJMSSHU4h3lTsdGacnps1Zxc=", - "dev": true - }, "@types/moment-timezone": { "version": "0.5.10", "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.10.tgz", @@ -1527,18 +1587,6 @@ "integrity": "sha512-Z/67L97+6H1qJiEEHSN1SQapkWjDss1D90rAnFcQ6UxKkah9juzotK5UNEP1bDv/0lJ3NAQTnVfc/JWdgCGruA==", "dev": true }, - "@types/q": { - "version": "0.0.32", - "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", - "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", - "dev": true - }, - "@types/selenium-webdriver": { - "version": "2.53.42", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.42.tgz", - "integrity": "sha1-dMt3+2BS7a/yqJhN2v2I1BnyXKw=", - "dev": true - }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -1809,36 +1857,6 @@ "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", "dev": true }, - "adm-zip": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", - "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=", - "dev": true - }, - "after": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", - "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", - "dev": true - }, - "agent-base": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz", - "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=", - "dev": true, - "requires": { - "extend": "3.0.1", - "semver": "5.0.3" - }, - "dependencies": { - "semver": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", - "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=", - "dev": true - } - } - }, "agentkeepalive": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz", @@ -1886,17 +1904,6 @@ "integrity": "sha512-CMzN9S62ZOO4sA/mJZIO4S++ZM7KFWzH3PPWkveLhy4OZ9i1/VatgwWMD46w/XbGCBy7Ye0gCk+Za6mmyfKK7g==", "dev": true }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - } - }, "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", @@ -1949,21 +1956,6 @@ "normalize-path": "2.1.1" } }, - "app-root-path": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz", - "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==", - "dev": true - }, - "append-transform": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", - "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", - "dev": true, - "requires": { - "default-require-extensions": "1.0.0" - } - }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -2022,12 +2014,6 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, - "array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", - "dev": true - }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -2049,12 +2035,6 @@ "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, - "arraybuffer.slice": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", - "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", - "dev": true - }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -2180,7 +2160,8 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", - "dev": true + "dev": true, + "optional": true }, "babel-code-frame": { "version": "6.26.0", @@ -2284,12 +2265,6 @@ "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", "dev": true }, - "backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", - "dev": true - }, "base": { "version": "0.11.2", "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", @@ -2363,24 +2338,12 @@ } } }, - "base64-arraybuffer": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", - "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", - "dev": true - }, "base64-js": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", "dev": true }, - "base64id": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", - "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", - "dev": true - }, "batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", @@ -2397,15 +2360,6 @@ "tweetnacl": "0.14.5" } }, - "better-assert": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", - "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", - "dev": true, - "requires": { - "callsite": "1.0.0" - } - }, "big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", @@ -2418,12 +2372,6 @@ "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=", "dev": true }, - "blob": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", - "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", - "dev": true - }, "block-stream": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", @@ -2433,15 +2381,6 @@ "inherits": "2.0.3" } }, - "blocking-proxy": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-0.0.5.tgz", - "integrity": "sha1-RikF4Nz76pcPQao3Ij3anAexkSs=", - "dev": true, - "requires": { - "minimist": "1.2.0" - } - }, "bluebird": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", @@ -2454,24 +2393,6 @@ "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", "dev": true }, - "body-parser": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", - "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "content-type": "1.0.4", - "debug": "2.6.9", - "depd": "1.1.1", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "on-finished": "2.3.0", - "qs": "6.5.1", - "raw-body": "2.3.2", - "type-is": "1.6.15" - } - }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -2491,6 +2412,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", "dev": true, + "optional": true, "requires": { "hoek": "4.2.0" } @@ -2775,12 +2697,6 @@ } } }, - "callsite": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", - "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", - "dev": true - }, "camelcase": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", @@ -2815,17 +2731,6 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - } - }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -2861,7 +2766,7 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", - "fsevents": "1.1.2", + "fsevents": "1.2.9", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -3042,20 +2947,6 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, - "codelyzer": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-3.2.2.tgz", - "integrity": "sha512-VNvW9gRThsqRarEnLioiILd0Pdk0yCq/7cVgYvqHpC+3CHqfnrJfmXjoana7vzWfSis+9pODXofjCWX+nlU9Gw==", - "dev": true, - "requires": { - "app-root-path": "2.2.1", - "css-selector-tokenizer": "0.7.1", - "cssauron": "1.4.0", - "semver-dsl": "1.0.1", - "source-map": "0.5.7", - "sprintf-js": "1.0.3" - } - }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -3081,21 +2972,6 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - }, - "combine-lists": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", - "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", - "dev": true, - "requires": { - "lodash": "4.17.4" - } - }, "combined-stream": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", @@ -3117,24 +2993,6 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, - "component-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", - "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", - "dev": true - }, - "component-emitter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", - "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", - "dev": true - }, - "component-inherit": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", - "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", - "dev": true - }, "compressible": { "version": "2.0.15", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", @@ -3193,35 +3051,6 @@ "typedarray": "0.0.6" } }, - "connect": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz", - "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=", - "dev": true, - "requires": { - "debug": "2.6.9", - "finalhandler": "1.0.6", - "parseurl": "1.3.2", - "utils-merge": "1.0.1" - }, - "dependencies": { - "finalhandler": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz", - "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" - } - } - } - }, "connect-history-api-fallback": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", @@ -3522,6 +3351,7 @@ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", "dev": true, + "optional": true, "requires": { "boom": "5.2.0" }, @@ -3531,6 +3361,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", "dev": true, + "optional": true, "requires": { "hoek": "4.2.0" } @@ -3562,32 +3393,6 @@ "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", "dev": true }, - "css-selector-tokenizer": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", - "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", - "dev": true, - "requires": { - "cssesc": "0.1.0", - "fastparse": "1.1.2", - "regexpu-core": "1.0.0" - } - }, - "cssauron": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", - "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", - "dev": true, - "requires": { - "through": "2.3.8" - } - }, - "cssesc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", - "dev": true - }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -3597,12 +3402,6 @@ "array-find-index": "1.0.2" } }, - "custom-event": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", - "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", - "dev": true - }, "cyclist": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", @@ -3672,15 +3471,6 @@ "ip-regex": "2.1.0" } }, - "default-require-extensions": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", - "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", - "dev": true, - "requires": { - "strip-bom": "2.0.0" - } - }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", @@ -3734,21 +3524,6 @@ } } }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" - } - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -3804,12 +3579,6 @@ "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", "dev": true }, - "di": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", - "dev": true - }, "diff": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", @@ -3878,18 +3647,6 @@ "buffer-indexof": "1.1.1" } }, - "dom-serialize": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", - "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", - "dev": true, - "requires": { - "custom-event": "1.0.1", - "ent": "2.2.0", - "extend": "3.0.1", - "void-elements": "2.0.1" - } - }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -3956,12 +3713,6 @@ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", "dev": true }, - "encodeurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", - "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=", - "dev": true - }, "encoding": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", @@ -3980,104 +3731,6 @@ "once": "1.4.0" } }, - "engine.io": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz", - "integrity": "sha1-a1m+cws0jAElsKRYneHDVavPen4=", - "dev": true, - "requires": { - "accepts": "1.3.3", - "base64id": "1.0.0", - "cookie": "0.3.1", - "debug": "2.3.3", - "engine.io-parser": "1.3.2", - "ws": "1.1.1" - }, - "dependencies": { - "accepts": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", - "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", - "dev": true, - "requires": { - "mime-types": "2.1.17", - "negotiator": "0.6.1" - } - }, - "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", - "dev": true, - "requires": { - "ms": "0.7.2" - } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - } - } - }, - "engine.io-client": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz", - "integrity": "sha1-w4dnVH8qfRhPV1L28K1QEAZwN2Y=", - "dev": true, - "requires": { - "component-emitter": "1.2.1", - "component-inherit": "0.0.3", - "debug": "2.3.3", - "engine.io-parser": "1.3.2", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parsejson": "0.0.3", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "ws": "1.1.1", - "xmlhttprequest-ssl": "1.5.3", - "yeast": "0.1.2" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", - "dev": true, - "requires": { - "ms": "0.7.2" - } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - } - } - }, - "engine.io-parser": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", - "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=", - "dev": true, - "requires": { - "after": "0.8.2", - "arraybuffer.slice": "0.0.6", - "base64-arraybuffer": "0.1.5", - "blob": "0.0.4", - "has-binary": "0.1.7", - "wtf-8": "1.0.0" - } - }, "enhanced-resolve": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", @@ -4089,12 +3742,6 @@ "tapable": "1.1.1" } }, - "ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", - "dev": true - }, "err-code": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", @@ -4303,56 +3950,6 @@ } } }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", - "dev": true - }, - "expand-braces": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", - "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", - "dev": true, - "requires": { - "array-slice": "0.2.3", - "array-unique": "0.2.1", - "braces": "0.1.5" - }, - "dependencies": { - "braces": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", - "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", - "dev": true, - "requires": { - "expand-range": "0.1.1" - } - }, - "expand-range": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", - "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", - "dev": true, - "requires": { - "is-number": "0.1.1", - "repeat-string": "0.2.2" - } - }, - "is-number": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", - "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=", - "dev": true - }, - "repeat-string": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", - "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=", - "dev": true - } - } - }, "expand-brackets": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", @@ -4527,7 +4124,8 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true + "dev": true, + "optional": true }, "extend-shallow": { "version": "3.0.2", @@ -4605,12 +4203,6 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, - "fastparse": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", - "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", - "dev": true - }, "faye-websocket": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", @@ -4651,16 +4243,6 @@ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", "dev": true }, - "fileset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", - "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", - "dev": true, - "requires": { - "glob": "7.1.2", - "minimatch": "3.0.4" - } - }, "fill-range": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", @@ -4782,6 +4364,7 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", "dev": true, + "optional": true, "requires": { "asynckit": "0.4.0", "combined-stream": "1.0.5", @@ -4819,15 +4402,6 @@ "readable-stream": "2.3.3" } }, - "fs-access": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", - "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", - "dev": true, - "requires": { - "null-check": "1.0.0" - } - }, "fs-minipass": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", @@ -4856,362 +4430,147 @@ "dev": true }, "fsevents": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", - "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", + "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", "dev": true, "optional": true, "requires": { - "nan": "2.7.0", - "node-pre-gyp": "0.6.36" + "nan": "2.14.0", + "node-pre-gyp": "0.12.0" }, "dependencies": { "abbrev": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", - "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=", + "version": "1.1.1", + "bundled": true, "dev": true, "optional": true }, - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "dev": true, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "bundled": true, "dev": true }, "aproba": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz", - "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=", + "version": "1.2.0", + "bundled": true, "dev": true, "optional": true }, "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "version": "1.1.5", + "bundled": true, "dev": true, "optional": true, "requires": { "delegates": "1.0.0", - "readable-stream": "2.2.9" + "readable-stream": "2.3.6" } }, - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", - "dev": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", - "dev": true, - "optional": true - }, "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "version": "1.0.0", + "bundled": true, "dev": true }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, "brace-expansion": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", - "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", + "version": "1.1.11", + "bundled": true, "dev": true, "requires": { - "balanced-match": "0.4.2", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, - "buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=", - "dev": true - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true, - "optional": true - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "chownr": { + "version": "1.1.1", + "bundled": true, "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "bundled": true, "dev": true }, - "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", - "dev": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "bundled": true, "dev": true }, "console-control-strings": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "bundled": true, "dev": true }, "core-util-is": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "optional": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "bundled": true, "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "optional": true - } - } + "optional": true }, "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "version": "4.1.1", + "bundled": true, "dev": true, "optional": true, "requires": { - "ms": "2.0.0" + "ms": "2.1.1" } }, "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "version": "0.6.0", + "bundled": true, "dev": true, "optional": true }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, "delegates": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "bundled": true, "dev": true, "optional": true }, - "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "detect-libc": { + "version": "1.0.3", + "bundled": true, "dev": true, "optional": true }, - "extsprintf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "fs-minipass": { + "version": "1.2.5", + "bundled": true, "dev": true, "optional": true, "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" + "minipass": "2.3.5" } }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "bundled": true, "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", - "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=", - "dev": true, - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } + "optional": true }, "gauge": { "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "bundled": true, "dev": true, "optional": true, "requires": { - "aproba": "1.1.1", + "aproba": "1.2.0", "console-control-strings": "1.1.0", "has-unicode": "2.0.1", "object-assign": "4.1.1", "signal-exit": "3.0.2", "string-width": "1.0.2", "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "optional": true - } + "wide-align": "1.1.3" } }, "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.1.3", + "bundled": true, "dev": true, + "optional": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -5221,73 +4580,35 @@ "path-is-absolute": "1.0.1" } }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", - "dev": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, "has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "bundled": true, "dev": true, "optional": true }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "iconv-lite": { + "version": "0.4.24", + "bundled": true, "dev": true, "optional": true, "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" + "safer-buffer": "2.1.2" } }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "ignore-walk": { + "version": "3.0.1", + "bundled": true, "dev": true, "optional": true, "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" + "minimatch": "3.0.4" } }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "bundled": true, "dev": true, + "optional": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -5295,199 +4616,136 @@ }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "bundled": true, "dev": true }, "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "version": "1.3.5", + "bundled": true, "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "bundled": true, "dev": true, "requires": { "number-is-nan": "1.0.1" } }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true, - "optional": true - }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "bundled": true, "dev": true, "optional": true }, - "jodid25519": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", - "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "dev": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", - "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "minimatch": { + "version": "3.0.4", + "bundled": true, "dev": true, - "optional": true, "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "optional": true - } + "brace-expansion": "1.1.11" } }, - "mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=", + "minimist": { + "version": "0.0.8", + "bundled": true, "dev": true }, - "mime-types": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "minipass": { + "version": "2.3.5", + "bundled": true, "dev": true, "requires": { - "mime-db": "1.27.0" + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "minizlib": { + "version": "1.2.1", + "bundled": true, "dev": true, + "optional": true, "requires": { - "brace-expansion": "1.1.7" + "minipass": "2.3.5" } }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "bundled": true, "dev": true, "requires": { "minimist": "0.0.8" } }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "2.1.1", + "bundled": true, "dev": true, "optional": true }, + "needle": { + "version": "2.3.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "4.1.1", + "iconv-lite": "0.4.24", + "sax": "1.2.4" + } + }, "node-pre-gyp": { - "version": "0.6.36", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz", - "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=", + "version": "0.12.0", + "bundled": true, "dev": true, "optional": true, "requires": { + "detect-libc": "1.0.3", "mkdirp": "0.5.1", + "needle": "2.3.0", "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" + "npm-packlist": "1.4.1", + "npmlog": "4.1.2", + "rc": "1.2.8", + "rimraf": "2.6.3", + "semver": "5.7.0", + "tar": "4.4.8" } }, "nopt": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "bundled": true, "dev": true, "optional": true, "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" + } + }, + "npm-bundled": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.4.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.6" } }, "npmlog": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz", - "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==", + "version": "4.1.2", + "bundled": true, "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", + "are-we-there-yet": "1.1.5", "console-control-strings": "1.1.0", "gauge": "2.7.4", "set-blocking": "2.0.0" @@ -5495,28 +4753,18 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "bundled": true, "dev": true }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "dev": true, - "optional": true - }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "bundled": true, "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "bundled": true, "dev": true, "requires": { "wrappy": "1.0.2" @@ -5524,22 +4772,19 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "bundled": true, "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "bundled": true, "dev": true, "optional": true }, "osenv": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "version": "0.1.5", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5549,182 +4794,98 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "bundled": true, "dev": true, "optional": true }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "version": "2.0.0", + "bundled": true, "dev": true, "optional": true }, "rc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", - "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "version": "1.2.8", + "bundled": true, "dev": true, "optional": true, "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", + "deep-extend": "0.6.0", + "ini": "1.3.5", "minimist": "1.2.0", "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "bundled": true, "dev": true, "optional": true } } }, "readable-stream": { - "version": "2.2.9", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", - "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=", + "version": "2.3.6", + "bundled": true, "dev": true, + "optional": true, "requires": { - "buffer-shims": "1.0.0", "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } }, - "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" - } - }, "rimraf": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "version": "2.6.3", + "bundled": true, "dev": true, + "optional": true, "requires": { - "glob": "7.1.2" + "glob": "7.1.3" } }, "safe-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", + "version": "5.1.2", + "bundled": true, "dev": true }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "version": "5.7.0", + "bundled": true, "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "bundled": true, "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "bundled": true, "dev": true, "optional": true }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "optional": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz", - "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=", - "dev": true, - "optional": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "optional": true - } - } - }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "dev": true, "requires": { "code-point-at": "1.1.0", @@ -5733,25 +4894,17 @@ } }, "string_decoder": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", - "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", + "version": "1.1.1", + "bundled": true, "dev": true, + "optional": true, "requires": { - "safe-buffer": "5.0.1" + "safe-buffer": "5.1.2" } }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", - "dev": true, - "optional": true - }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "bundled": true, "dev": true, "requires": { "ansi-regex": "2.1.1" @@ -5759,100 +4912,34 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "bundled": true, "dev": true, "optional": true }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz", - "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=", - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", - "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", - "dev": true, - "optional": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "version": "4.4.8", + "bundled": true, "dev": true, "optional": true, "requires": { - "safe-buffer": "5.0.1" + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", - "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=", - "dev": true, - "optional": true - }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "uuid": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", - "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=", + "bundled": true, "dev": true, "optional": true }, - "verror": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", - "dev": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "version": "1.1.3", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -5861,8 +4948,12 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "bundled": true, + "dev": true + }, + "yallist": { + "version": "3.0.3", + "bundled": true, "dev": true } } @@ -6007,20 +5098,6 @@ "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", "dev": true }, - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, "globule": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", @@ -6043,11 +5120,6 @@ "resolved": "https://registry.npmjs.org/guacamole-common-js/-/guacamole-common-js-1.0.0-b.tgz", "integrity": "sha512-DLEy7yBQvwwJ4xoWfj1Z+DLOKCy5zwW4ELdpDeYKVWZMpBegbGGwI5qWb61b3aT7KBWsF6DRJHviPlcFHUdMRA==" }, - "hammerjs": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", - "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" - }, "handle-thing": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz", @@ -6085,6 +5157,7 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "dev": true, + "optional": true, "requires": { "ajv": "5.2.3", "har-schema": "2.0.0" @@ -6095,46 +5168,24 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz", "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=", "dev": true, + "optional": true, "requires": { "co": "4.6.0", "fast-deep-equal": "1.0.0", "json-schema-traverse": "0.3.1", "json-stable-stringify": "1.0.1" - } - } - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-binary": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", - "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=", - "dev": true, - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true + } } } }, - "has-cors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", - "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", - "dev": true + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } }, "has-flag": { "version": "1.0.0", @@ -6233,6 +5284,7 @@ "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", "dev": true, + "optional": true, "requires": { "boom": "4.3.1", "cryptiles": "3.1.2", @@ -6685,17 +5737,6 @@ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, - "https-proxy-agent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz", - "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=", - "dev": true, - "requires": { - "agent-base": "2.1.1", - "debug": "2.6.9", - "extend": "3.0.1" - } - }, "humanize-ms": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", @@ -6876,12 +5917,6 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, - "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", - "dev": true - }, "inquirer": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz", @@ -7247,12 +6282,6 @@ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, - "isbinaryfile": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz", - "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=", - "dev": true - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -7335,25 +6364,6 @@ } } }, - "istanbul-api": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.14.tgz", - "integrity": "sha1-JbxXAffGgMD//5E95G42GaOm5oA=", - "dev": true, - "requires": { - "async": "2.5.0", - "fileset": "2.0.3", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.0.7", - "istanbul-lib-instrument": "1.8.0", - "istanbul-lib-report": "1.1.1", - "istanbul-lib-source-maps": "1.2.1", - "istanbul-reports": "1.1.2", - "js-yaml": "3.7.0", - "mkdirp": "0.5.1", - "once": "1.4.0" - } - }, "istanbul-instrumenter-loader": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz", @@ -7395,15 +6405,6 @@ "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", "dev": true }, - "istanbul-lib-hook": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz", - "integrity": "sha512-3U2HB9y1ZV9UmFlE12Fx+nPtFqIymzrqCksrXujm3NVbAZIJg/RfYgO1XiIa0mbmxTjWpVEVlkIZJ25xVIAfkQ==", - "dev": true, - "requires": { - "append-transform": "0.4.0" - } - }, "istanbul-lib-instrument": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.8.0.tgz", @@ -7419,187 +6420,6 @@ "semver": "5.4.1" } }, - "istanbul-lib-report": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz", - "integrity": "sha512-tvF+YmCmH4thnez6JFX06ujIA19WPa9YUiwjc1uALF2cv5dmE3It8b5I8Ob7FHJ70H9Y5yF+TDkVa/mcADuw1Q==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" - } - }, - "istanbul-lib-source-maps": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz", - "integrity": "sha512-mukVvSXCn9JQvdJl8wP/iPhqig0MRtuWuD4ZNKo6vB2Ik//AmhAKe3QnPN02dmkRe3lTudFk3rzoHhwU4hb94w==", - "dev": true, - "requires": { - "debug": "2.6.9", - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" - } - }, - "istanbul-reports": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.2.tgz", - "integrity": "sha1-D7Lj9qqZIr085F0F2KtNXo4HvU8=", - "dev": true, - "requires": { - "handlebars": "4.0.10" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "optional": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, - "optional": true - } - } - }, - "handlebars": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", - "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", - "dev": true, - "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" - } - }, - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" - } - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "optional": true - } - } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } - } - }, - "jasmine": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz", - "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=", - "dev": true, - "requires": { - "exit": "0.1.2", - "glob": "7.1.2", - "jasmine-core": "2.8.0" - }, - "dependencies": { - "jasmine-core": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz", - "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=", - "dev": true - } - } - }, - "jasmine-core": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.5.2.tgz", - "integrity": "sha1-b2G9eQYeJ/Q+b5NV5Es8bKtv8pc=", - "dev": true - }, - "jasmine-spec-reporter": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-3.2.0.tgz", - "integrity": "sha1-/b6FqAzN07J2dGvHf96Dwc53Pv8=", - "dev": true, - "requires": { - "colors": "1.1.2" - } - }, - "jasminewd2": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz", - "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", - "dev": true - }, "js-base64": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz", @@ -7629,12 +6449,6 @@ "dev": true, "optional": true }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -7658,6 +6472,7 @@ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "dev": true, + "optional": true, "requires": { "jsonify": "0.0.0" } @@ -7687,7 +6502,8 @@ "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true + "dev": true, + "optional": true }, "jsonparse": { "version": "1.3.1", @@ -7707,117 +6523,6 @@ "verror": "1.10.0" } }, - "karma": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz", - "integrity": "sha1-QZgacdVCN2BrCj6oxYyQdz9BZQ4=", - "dev": true, - "requires": { - "bluebird": "3.5.1", - "body-parser": "1.18.2", - "chokidar": "1.7.0", - "colors": "1.1.2", - "combine-lists": "1.0.1", - "connect": "3.6.5", - "core-js": "2.4.1", - "di": "0.0.1", - "dom-serialize": "2.2.1", - "expand-braces": "0.1.2", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "http-proxy": "1.16.2", - "isbinaryfile": "3.0.2", - "lodash": "3.10.1", - "log4js": "0.6.38", - "mime": "1.4.1", - "minimatch": "3.0.4", - "optimist": "0.6.1", - "qjobs": "1.1.5", - "range-parser": "1.2.0", - "rimraf": "2.6.2", - "safe-buffer": "5.1.1", - "socket.io": "1.7.2", - "source-map": "0.5.7", - "tmp": "0.0.28", - "useragent": "2.2.1" - }, - "dependencies": { - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", - "dev": true - }, - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" - } - }, - "tmp": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", - "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=", - "dev": true, - "requires": { - "os-tmpdir": "1.0.2" - } - } - } - }, - "karma-chrome-launcher": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.0.0.tgz", - "integrity": "sha1-wnkMWjKxVXfQ//Wk1aJwOztDnCU=", - "dev": true, - "requires": { - "fs-access": "1.0.1", - "which": "1.3.0" - } - }, - "karma-cli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz", - "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=", - "dev": true, - "requires": { - "resolve": "1.4.0" - } - }, - "karma-coverage-istanbul-reporter": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.3.tgz", - "integrity": "sha1-EfG+nPqTdVp3usOasW4xWnEAtcU=", - "dev": true, - "requires": { - "istanbul-api": "1.1.14" - } - }, - "karma-jasmine": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.0.tgz", - "integrity": "sha1-IuTAa/mhguUpTR9wXjczgRuBCs8=", - "dev": true - }, - "karma-jasmine-html-reporter": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz", - "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=", - "dev": true, - "requires": { - "karma-jasmine": "1.1.0" - } - }, "karma-source-map-support": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz", @@ -7860,13 +6565,6 @@ "is-buffer": "1.1.5" } }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true - }, "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", @@ -8011,61 +6709,19 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, - "lodash.mergewith": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", - "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", - "dev": true - }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, - "log4js": { - "version": "0.6.38", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", - "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", - "dev": true, - "requires": { - "readable-stream": "1.0.34", - "semver": "4.3.6" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } - } + "dev": true + }, + "lodash.mergewith": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", + "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", + "dev": true + }, + "lodash.tail": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", + "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", + "dev": true }, "loglevel": { "version": "1.6.1", @@ -8073,12 +6729,6 @@ "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=", "dev": true }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, "loose-envify": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", @@ -8570,9 +7220,9 @@ "dev": true }, "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", "dev": true, "optional": true }, @@ -8635,16 +7285,6 @@ "date-fns": "1.30.1" } }, - "ng2-toastr": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/ng2-toastr/-/ng2-toastr-4.1.2.tgz", - "integrity": "sha1-G0UvBxOZYcOPhmxuJKBiR++iGxE=" - }, - "ngx-mat-daterange-picker": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/ngx-mat-daterange-picker/-/ngx-mat-daterange-picker-1.1.4.tgz", - "integrity": "sha512-bfIYGJicxwg58j6LZjUE5JPXqq7yJfremFhX5S/DnUYwQjgmDWN6PUOFEegEO7ua4QdgGWrhK04ElOw25aWrzQ==" - }, "ngx-toastr": { "version": "9.1.2", "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-9.1.2.tgz", @@ -9075,12 +7715,6 @@ "set-blocking": "2.0.0" } }, - "null-check": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", - "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=", - "dev": true - }, "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", @@ -9097,7 +7731,8 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -9105,12 +7740,6 @@ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, - "object-component": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", - "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", - "dev": true - }, "object-copy": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", @@ -9265,12 +7894,6 @@ } } }, - "options": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", - "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", - "dev": true - }, "original": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", @@ -9541,33 +8164,6 @@ "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", "dev": true }, - "parsejson": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", - "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", - "dev": true, - "requires": { - "better-assert": "1.0.2" - } - }, - "parseqs": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", - "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", - "dev": true, - "requires": { - "better-assert": "1.0.2" - } - }, - "parseuri": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", - "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", - "dev": true, - "requires": { - "better-assert": "1.0.2" - } - }, "parseurl": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", @@ -9891,80 +8487,6 @@ "genfun": "5.0.0" } }, - "protractor": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz", - "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", - "dev": true, - "requires": { - "@types/node": "6.0.89", - "@types/q": "0.0.32", - "@types/selenium-webdriver": "2.53.42", - "blocking-proxy": "0.0.5", - "chalk": "1.1.3", - "glob": "7.1.2", - "jasmine": "2.8.0", - "jasminewd2": "2.2.0", - "optimist": "0.6.1", - "q": "1.4.1", - "saucelabs": "1.3.0", - "selenium-webdriver": "3.0.1", - "source-map-support": "0.4.18", - "webdriver-js-extender": "1.0.0", - "webdriver-manager": "12.0.6" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" - } - }, - "q": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", - "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=", - "dev": true - }, - "webdriver-manager": { - "version": "12.0.6", - "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.0.6.tgz", - "integrity": "sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=", - "dev": true, - "requires": { - "adm-zip": "0.4.7", - "chalk": "1.1.3", - "del": "2.2.2", - "glob": "7.1.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "q": "1.4.1", - "request": "2.83.0", - "rimraf": "2.6.2", - "semver": "5.4.1", - "xml2js": "0.4.19" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - } - } - }, "proxy-addr": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", @@ -10054,17 +8576,12 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true }, - "qjobs": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz", - "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=", - "dev": true - }, "qs": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", - "dev": true + "dev": true, + "optional": true }, "querystring": { "version": "0.2.0", @@ -10150,18 +8667,6 @@ "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", "dev": true }, - "raw-body": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "unpipe": "1.0.0" - } - }, "raw-loader": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz", @@ -10254,12 +8759,6 @@ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", "dev": true }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", - "dev": true - }, "regenerator-runtime": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", @@ -10285,32 +8784,6 @@ "safe-regex": "1.1.0" } }, - "regexpu-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", - "dev": true, - "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, - "requires": { - "jsesc": "0.5.0" - } - }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -10343,6 +8816,7 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", "dev": true, + "optional": true, "requires": { "aws-sign2": "0.7.0", "aws4": "1.6.0", @@ -10444,16 +8918,6 @@ "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", "dev": true }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4" - } - }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", @@ -10565,21 +9029,6 @@ } } }, - "saucelabs": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz", - "integrity": "sha1-0kDoAJ33+ocwbsRXimm6O1xCT+4=", - "dev": true, - "requires": { - "https-proxy-agent": "1.0.0" - } - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", @@ -10618,29 +9067,6 @@ "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", "dev": true }, - "selenium-webdriver": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz", - "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=", - "dev": true, - "requires": { - "adm-zip": "0.4.7", - "rimraf": "2.6.2", - "tmp": "0.0.30", - "xml2js": "0.4.19" - }, - "dependencies": { - "tmp": { - "version": "0.0.30", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", - "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", - "dev": true, - "requires": { - "os-tmpdir": "1.0.2" - } - } - } - }, "selfsigned": { "version": "1.10.4", "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz", @@ -10656,15 +9082,6 @@ "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", "dev": true }, - "semver-dsl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", - "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", - "dev": true, - "requires": { - "semver": "5.4.1" - } - }, "semver-intersect": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz", @@ -10948,193 +9365,52 @@ "dev": true, "requires": { "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "sntp": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz", - "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=", - "dev": true, - "requires": { - "hoek": "4.2.0" - } - }, - "socket.io": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz", - "integrity": "sha1-g7u98ueSY7N4kA2kA+eEPgXcO3E=", - "dev": true, - "requires": { - "debug": "2.3.3", - "engine.io": "1.8.2", - "has-binary": "0.1.7", - "object-assign": "4.1.0", - "socket.io-adapter": "0.5.0", - "socket.io-client": "1.7.2", - "socket.io-parser": "2.3.1" - }, - "dependencies": { - "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", - "dev": true, - "requires": { - "ms": "0.7.2" - } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - }, - "object-assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=", - "dev": true - } - } - }, - "socket.io-adapter": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz", - "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=", - "dev": true, - "requires": { - "debug": "2.3.3", - "socket.io-parser": "2.3.1" - }, - "dependencies": { - "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", - "dev": true, - "requires": { - "ms": "0.7.2" - } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - } - } - }, - "socket.io-client": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz", - "integrity": "sha1-Of2ww91FDjIbfkDP2DYS7FM91kQ=", - "dev": true, - "requires": { - "backo2": "1.0.2", - "component-bind": "1.0.0", - "component-emitter": "1.2.1", - "debug": "2.3.3", - "engine.io-client": "1.8.2", - "has-binary": "0.1.7", - "indexof": "0.0.1", - "object-component": "0.0.3", - "parseuri": "0.0.5", - "socket.io-parser": "2.3.1", - "to-array": "0.1.4" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", - "dev": true, - "requires": { - "ms": "0.7.2" - } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - } - } - }, - "socket.io-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", - "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", - "dev": true, - "requires": { - "component-emitter": "1.1.2", - "debug": "2.2.0", - "isarray": "0.0.1", - "json3": "3.3.2" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "ms": "0.7.1" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "sntp": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz", + "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=", + "dev": true, + "optional": true, + "requires": { + "hoek": "4.2.0" + } + }, "sockjs": { "version": "0.3.19", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", @@ -11616,7 +9892,8 @@ "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", - "dev": true + "dev": true, + "optional": true }, "strip-ansi": { "version": "3.0.1", @@ -11949,12 +10226,6 @@ "os-tmpdir": "1.0.2" } }, - "to-array": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", - "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", - "dev": true - }, "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", @@ -12014,6 +10285,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "dev": true, + "optional": true, "requires": { "punycode": "1.4.1" } @@ -12196,16 +10468,6 @@ "prelude-ls": "1.1.2" } }, - "type-is": { - "version": "1.6.15", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", - "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "2.1.17" - } - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -12238,19 +10500,6 @@ } } }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "ultron": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", - "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=", - "dev": true - }, "union-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", @@ -12425,24 +10674,6 @@ "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", "dev": true }, - "useragent": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz", - "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=", - "dev": true, - "requires": { - "lru-cache": "2.2.4", - "tmp": "0.0.33" - }, - "dependencies": { - "lru-cache": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", - "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=", - "dev": true - } - } - }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", @@ -12524,12 +10755,6 @@ "indexof": "0.0.1" } }, - "void-elements": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", - "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", - "dev": true - }, "watchpack": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", @@ -12777,24 +11002,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, "requires": { @@ -12804,12 +11033,14 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "1.0.0", @@ -12818,34 +11049,40 @@ }, "chownr": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "2.6.9", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "optional": true, "requires": { @@ -12854,25 +11091,29 @@ }, "deep-extend": { "version": "0.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, "requires": { @@ -12881,13 +11122,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -12903,7 +11146,8 @@ }, "glob": { "version": "7.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, "requires": { @@ -12917,13 +11161,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "bundled": true, + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, "requires": { @@ -12932,7 +11178,8 @@ }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, "requires": { @@ -12941,7 +11188,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -12951,18 +11199,21 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { "number-is-nan": "1.0.1" @@ -12970,13 +11221,15 @@ }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "1.1.11" @@ -12984,12 +11237,14 @@ }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, "minipass": { "version": "2.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "requires": { "safe-buffer": "5.1.2", @@ -12998,7 +11253,8 @@ }, "minizlib": { "version": "1.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, "requires": { @@ -13007,7 +11263,8 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" @@ -13015,13 +11272,15 @@ }, "ms": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true, "optional": true }, "needle": { "version": "2.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", + "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", "dev": true, "optional": true, "requires": { @@ -13032,7 +11291,8 @@ }, "node-pre-gyp": { "version": "0.10.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz", + "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==", "dev": true, "optional": true, "requires": { @@ -13050,7 +11310,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -13060,13 +11321,15 @@ }, "npm-bundled": { "version": "1.0.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", + "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz", + "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==", "dev": true, "optional": true, "requires": { @@ -13076,7 +11339,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -13088,18 +11352,21 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1.0.2" @@ -13107,19 +11374,22 @@ }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -13129,19 +11399,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, "requires": { @@ -13153,7 +11426,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -13161,7 +11435,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -13176,7 +11451,8 @@ }, "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, "requires": { @@ -13185,42 +11461,49 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { "code-point-at": "1.1.0", @@ -13230,7 +11513,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -13239,7 +11523,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { "ansi-regex": "2.1.1" @@ -13247,13 +11532,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, "requires": { @@ -13268,13 +11555,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, "requires": { @@ -13283,12 +11572,14 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "yallist": { "version": "3.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true } } @@ -13434,59 +11725,6 @@ "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz", "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA=" }, - "webdriver-js-extender": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz", - "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=", - "dev": true, - "requires": { - "@types/selenium-webdriver": "2.53.42", - "selenium-webdriver": "2.53.3" - }, - "dependencies": { - "adm-zip": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz", - "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=", - "dev": true - }, - "sax": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", - "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=", - "dev": true - }, - "selenium-webdriver": { - "version": "2.53.3", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz", - "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=", - "dev": true, - "requires": { - "adm-zip": "0.4.4", - "rimraf": "2.6.2", - "tmp": "0.0.24", - "ws": "1.1.1", - "xml2js": "0.4.4" - } - }, - "tmp": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz", - "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI=", - "dev": true - }, - "xml2js": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz", - "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=", - "dev": true, - "requires": { - "sax": "0.6.1", - "xmlbuilder": "9.0.4" - } - } - } - }, "webpack": { "version": "4.29.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz", @@ -14246,24 +12484,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, "requires": { @@ -14273,12 +12515,14 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "1.0.0", @@ -14287,34 +12531,40 @@ }, "chownr": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "2.6.9", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "optional": true, "requires": { @@ -14323,25 +12573,29 @@ }, "deep-extend": { "version": "0.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, "requires": { @@ -14350,13 +12604,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -14372,7 +12628,8 @@ }, "glob": { "version": "7.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, "requires": { @@ -14386,13 +12643,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "bundled": true, + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, "requires": { @@ -14401,7 +12660,8 @@ }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, "requires": { @@ -14410,7 +12670,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -14420,18 +12681,21 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { "number-is-nan": "1.0.1" @@ -14439,13 +12703,15 @@ }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "1.1.11" @@ -14453,12 +12719,14 @@ }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, "minipass": { "version": "2.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "requires": { "safe-buffer": "5.1.2", @@ -14467,7 +12735,8 @@ }, "minizlib": { "version": "1.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, "requires": { @@ -14476,7 +12745,8 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" @@ -14484,13 +12754,15 @@ }, "ms": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true, "optional": true }, "needle": { "version": "2.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", + "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", "dev": true, "optional": true, "requires": { @@ -14501,7 +12773,8 @@ }, "node-pre-gyp": { "version": "0.10.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz", + "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==", "dev": true, "optional": true, "requires": { @@ -14519,7 +12792,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -14529,13 +12803,15 @@ }, "npm-bundled": { "version": "1.0.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", + "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz", + "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==", "dev": true, "optional": true, "requires": { @@ -14545,7 +12821,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -14557,18 +12834,21 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1.0.2" @@ -14576,19 +12856,22 @@ }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -14598,19 +12881,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, "requires": { @@ -14622,7 +12908,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -14630,7 +12917,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -14645,7 +12933,8 @@ }, "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, "requires": { @@ -14654,42 +12943,49 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { "code-point-at": "1.1.0", @@ -14699,7 +12995,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -14708,7 +13005,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { "ansi-regex": "2.1.1" @@ -14716,13 +13014,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, "requires": { @@ -14737,13 +13037,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, "requires": { @@ -14752,12 +13054,14 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "yallist": { "version": "3.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true } } @@ -15186,13 +13490,6 @@ } } }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, - "optional": true - }, "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", @@ -15246,49 +13543,11 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, - "ws": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz", - "integrity": "sha1-CC3bbGQehdS7RR8D1S8G6r2x8Bg=", - "dev": true, - "requires": { - "options": "0.0.6", - "ultron": "1.0.2" - } - }, - "wtf-8": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz", - "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", - "dev": true - }, "xhr2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz", "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=" }, - "xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", - "dev": true, - "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.4" - } - }, - "xmlbuilder": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz", - "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=", - "dev": true - }, - "xmlhttprequest-ssl": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", - "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", - "dev": true - }, "xregexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", @@ -15379,12 +13638,6 @@ } } }, - "yeast": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", - "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", - "dev": true - }, "yn": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/yn/-/yn-1.3.0.tgz", diff --git a/services/self-service/src/main/resources/webapp/package.json b/services/self-service/src/main/resources/webapp/package.json index ecb4388546..2154b3cff2 100644 --- a/services/self-service/src/main/resources/webapp/package.json +++ b/services/self-service/src/main/resources/webapp/package.json @@ -14,14 +14,14 @@ }, "private": true, "dependencies": { - "@angular/animations": "^8.0.0-beta.2", - "@angular/cdk": "^6.1", + "@angular/animations": "^7.2.15", + "@angular/cdk": "^7.3.7", "@angular/common": "^8.0.0-beta.2", "@angular/compiler": "^8.0.0-beta.2", "@angular/core": "^8.0.0-beta.2", "@angular/forms": "^8.0.0-beta.2", "@angular/http": "^8.0.0-beta.2", - "@angular/material": "^6.1", + "@angular/material": "^7.3.7", "@angular/material-moment-adapter": "^5.2.3", "@angular/platform-browser": "^8.0.0-beta.2", "@angular/platform-browser-dynamic": "^8.0.0-beta.2", @@ -29,12 +29,9 @@ "@angular/router": "^8.0.0-beta.2", "core-js": "2.4.1", "guacamole-common-js": "^1.0.0-b", - "hammerjs": "^2.0.8", "moment": "^2.20.1", "moment-timezone": "^0.5.16", "ng-daterangepicker": "^1.1.0", - "ng2-toastr": "^4.1.2", - "ngx-mat-daterange-picker": "^1.1.4", "ngx-toastr": "^9.1.2", "rxjs": "6.0.0", "rxjs-compat": "6.0.0", @@ -46,20 +43,9 @@ "@angular-devkit/build-angular": "^0.13.0", "@angular/cli": "^7.3.0", "@angular/compiler-cli": "^8.0.0-beta.2", - "@types/jasmine": "2.5.38", "@types/moment-timezone": "^0.5.4", "@types/node": "~6.0.60", - "codelyzer": "^3.0.1", - "jasmine-core": "~2.5.2", - "jasmine-spec-reporter": "~3.2.0", - "karma": "~1.4.1", - "karma-chrome-launcher": "~2.0.0", - "karma-cli": "~1.0.1", - "karma-coverage-istanbul-reporter": "^0.2.0", - "karma-jasmine": "~1.1.0", - "karma-jasmine-html-reporter": "^0.2.2", "node-sass": "^4.7.2", - "protractor": "~5.1.0", "ts-node": "~2.0.0", "tslint": "^5.15.0", "typescript": "^3.2.4" diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts index eea9fb5792..37e9bb05b0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts @@ -22,7 +22,6 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { NgDateRangePickerModule } from 'ng-daterangepicker'; -import { NgxMatDrpModule } from 'ngx-mat-daterange-picker'; import { MaterialModule } from '../shared/material.module'; import { FormControlsModule } from '../shared/form-controls'; import { ReportingComponent } from './reporting.component'; @@ -39,7 +38,6 @@ import { ToolbarComponent } from './toolbar/toolbar.component'; FormControlsModule, KeysPipeModule, LineBreaksPipeModule, - NgxMatDrpModule, NgDateRangePickerModule, UploadKeyDialogModule, ProgressDialogModule, diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index c02e0ef8fe..399b7b9c2e 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -380,3 +380,6 @@ input[type='number'] { } } } + +html, body { height: 100%; } +body { margin: 0; font-family: 'Roboto', sans-serif; } From f841d27a4f1bdd8fedb887730a7ade0c0a67a788 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Sun, 19 May 2019 12:54:53 +0300 Subject: [PATCH 002/357] added layout as a middle route stage --- .../src/app/layout/layout.component.html | 20 ++++++++++++ .../webapp/src/app/layout/layout.component.ts | 29 +++++++++++++++++ .../webapp/src/app/layout/layout.module.ts | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 services/self-service/src/main/resources/webapp/src/app/layout/layout.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/layout/layout.component.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/layout/layout.module.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.html b/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.html new file mode 100644 index 0000000000..dcab0d8b32 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.html @@ -0,0 +1,20 @@ + + + diff --git a/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.ts b/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.ts new file mode 100644 index 0000000000..969969844b --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.ts @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'dlab-layout', + templateUrl: './layout.component.html', +}) +export class LayoutComponent implements OnInit { + constructor() { } + ngOnInit() { } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/layout/layout.module.ts b/services/self-service/src/main/resources/webapp/src/app/layout/layout.module.ts new file mode 100644 index 0000000000..1f18582b37 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/layout/layout.module.ts @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { CommonModule } from '@angular/common'; + +import { LayoutComponent } from './layout.component'; +import { NavbarModule } from '../shared/navbar'; + +@NgModule({ + imports: [CommonModule, RouterModule, NavbarModule], + declarations: [LayoutComponent], + exports: [LayoutComponent] +}) +export class LayoutModule { } \ No newline at end of file From e433115b3c38ec77cd078cc63ad8a0a11a7ac66e Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Sun, 19 May 2019 12:55:23 +0300 Subject: [PATCH 003/357] added layout as a middle route stage --- .../webapp/src/app/app.component.html | 1 - .../resources/webapp/src/app/app.module.ts | 7 ++- .../webapp/src/app/app.routing.module.ts | 60 +++++++++++-------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/app.component.html b/services/self-service/src/main/resources/webapp/src/app/app.component.html index de9deb44ac..aa0751bbbb 100644 --- a/services/self-service/src/main/resources/webapp/src/app/app.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/app.component.html @@ -17,5 +17,4 @@ ~ under the License. --> - diff --git a/services/self-service/src/main/resources/webapp/src/app/app.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.module.ts index 88aa6308ca..f54760fbea 100644 --- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts @@ -19,7 +19,7 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { RouterModule, Router } from '@angular/router'; +import { RouterModule } from '@angular/router'; import { BrowserModule } from '@angular/platform-browser'; import { LocationStrategy, HashLocationStrategy } from '@angular/common'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; @@ -29,7 +29,8 @@ import { AppComponent } from './app.component'; import { AppRoutingModule } from './app.routing.module'; import { LoginModule } from './login/login.module'; -import { NavbarModule } from './shared/navbar'; +import { LayoutModule } from './layout/layout.module' + import { GuidesModule } from './help'; import { NotFoundModule } from './not-found/not-found.module'; import { AccessDeniedModule } from './access-denied/access-denied.module'; @@ -54,7 +55,7 @@ import { ToastrModule } from 'ngx-toastr'; ReactiveFormsModule, HttpClientModule, LoginModule, - NavbarModule, + LayoutModule, ResourcesModule, GuidesModule, NotFoundModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts index eba8d7e8fc..3476df70d2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts @@ -21,6 +21,7 @@ import { ModuleWithProviders } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { LoginComponent } from './login/login.module'; +import { LayoutComponent } from './layout/layout.component' import { ResourcesComponent } from './resources/resources.component'; import { AccessNotebookGuideComponent, PublicKeyGuideComponent } from './help'; import { NotFoundComponent } from './not-found/not-found.component'; @@ -34,36 +35,43 @@ const routes: Routes = [{ path: 'login', component: LoginComponent }, { - path: 'resources_list', - component: ResourcesComponent, - canActivate: [CheckParamsGuard] - }, { - path: 'billing_report', - component: ReportingComponent, - canActivate: [AuthorizationGuard, CloudProviderGuard] - }, { - path: 'environment_management', - component: ManagementComponent, - canActivate: [AuthorizationGuard] - }, { - path: 'terminal/:id', - component: WebterminalComponent - }, { - path: 'help/publickeyguide', - component: PublicKeyGuideComponent, - canActivate: [AuthorizationGuard] - }, { - path: 'help/accessnotebookguide', - component: AccessNotebookGuideComponent, - canActivate: [AuthorizationGuard] + path: '', + canActivate: [AuthorizationGuard], + component: LayoutComponent, + children: [ + { + path: '', + redirectTo: 'resources_list', + pathMatch: 'full' + }, { + path: 'resources_list', + component: ResourcesComponent, + canActivate: [CheckParamsGuard] + }, { + path: 'billing_report', + component: ReportingComponent, + canActivate: [AuthorizationGuard, CloudProviderGuard] + }, { + path: 'environment_management', + component: ManagementComponent, + canActivate: [AuthorizationGuard] + }, { + path: 'terminal/:id', + component: WebterminalComponent + }, { + path: 'help/publickeyguide', + component: PublicKeyGuideComponent, + canActivate: [AuthorizationGuard] + }, { + path: 'help/accessnotebookguide', + component: AccessNotebookGuideComponent, + canActivate: [AuthorizationGuard] + } + ] }, { path: '403', component: AccessDeniedComponent, canActivate: [AuthorizationGuard] - }, { - path: '', - redirectTo: 'resources_list', - pathMatch: 'full' }, { path: '**', component: NotFoundComponent From 7014180a08cd4f2810dd4f6a52624bc54cf475ef Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Sun, 19 May 2019 12:59:36 +0300 Subject: [PATCH 004/357] added side navigation component; --- .../app/shared/navbar/navbar.component.html | 80 ++++++++++++------- .../app/shared/navbar/navbar.component.scss | 2 +- .../src/app/shared/navbar/navbar.component.ts | 10 ++- 3 files changed, 63 insertions(+), 29 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 6c3ca0f382..d947001432 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -17,21 +17,21 @@ ~ under the License. --> -
+
- - + info
-

- Version: - {{ metadata?.version }} -

-

- Branch: - {{ metadata?.branch }} -

-

- Revision: - {{ metadata?.commit }} -

-

- - linkRelease notes -

+

+ Version: + {{ metadata?.version }} +

+

+ Branch: + {{ metadata?.branch }} +

+

+ Revision: + {{ metadata?.commit }} +

+

+ + linkRelease notes +

- +
+
+ + + + + + + + + + + + - - + + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss index e941536d4f..ee21e24085 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss @@ -122,7 +122,7 @@ a.nav-item { position: relative; height: 56px; - padding: 5px 40px; + padding: 5px; line-height: 48px; font-family: "Open Sans", sans-serif; transition: all .45s ease-in-out; diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index ef87728f6e..603af493b0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -53,6 +53,7 @@ export class NavbarComponent implements OnInit, OnDestroy { quotesLimit: number = 70; isLoggedIn: boolean = false; metadata: any; + isExpanded: boolean = false; healthStatus: GeneralEnvironmentStatus; subscriptions: Subscription = new Subscription(); @@ -114,6 +115,10 @@ export class NavbarComponent implements OnInit, OnDestroy { error => console.error(error)); } + collapse() { + this.isExpanded = !this.isExpanded; + } + public emitQuotes(alert, user_quota?, total_quota?): void { const dialogRef: MatDialogRef = this.dialog.open(NotificationDialogComponent, { data: { template: this.selectQuotesAlert(alert, user_quota, total_quota), type: 'message' }, @@ -204,7 +209,10 @@ export class NavbarComponent implements OnInit, OnDestroy { public checkVersionData(): void { this.healthStatusService.getAppMetaData().subscribe( result => this.metadata = result || null, - error => this.toastr.error('Metadata loading failed!', 'Oops!')); + error => { + console.log('Metadata loading failed!'); + // this.toastr.error('Metadata loading failed!', 'Oops!'); + }); } private selectQuotesAlert(type: string, user_quota?: number, total_quota?: number): string { From 06e654392dacb9b8b0d8bbdf6709edf72c7746b5 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Sun, 19 May 2019 17:34:04 +0300 Subject: [PATCH 005/357] added dialog providers --- .../src/main/resources/webapp/src/app/app.module.ts | 1 - .../src/main/resources/webapp/src/app/core/core.module.ts | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/app.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.module.ts index f54760fbea..01ca32f6b4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts @@ -42,7 +42,6 @@ import { ErrorInterceptor } from './core/interceptors/error.interceptor'; import { ReportingModule } from './reporting/reporting.module'; import { ManagenementModule } from './management'; import { WebterminalModule } from './webterminal'; - import { CoreModule } from './core/core.module'; import { ToastrModule } from 'ngx-toastr'; diff --git a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts index a8bf9c7886..9d073a2b8a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts @@ -38,6 +38,8 @@ import { RolesGroupsService } from './services/rolesManagement.service'; import { DataengineConfigurationService } from './services/dataengineConfiguration.service'; import { StorageService } from './services/storage.service'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; + @NgModule({ imports: [CommonModule], declarations: [], @@ -68,7 +70,10 @@ export class CoreModule { RolesGroupsService, ApplicationServiceFacade, DataengineConfigurationService, - StorageService + StorageService, + + { provide: MatDialogRef, useValue: {} }, + { provide: MAT_DIALOG_DATA, useValue: [] } ] }; } From f4da4bccf24480cfffa2fa88f87447e5f6fdaefc Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Sun, 19 May 2019 17:35:15 +0300 Subject: [PATCH 006/357] added material controllers into detail dialog --- .../detail-dialog.component.html | 12 +++--- .../detail-dialog/detail-dialog.component.ts | 41 +++++++++---------- .../exploratory/detail-dialog/index.ts | 1 + .../resources-grid.component.html | 3 +- .../resources-grid.component.ts | 7 +++- .../app/shared/navbar/navbar.component.scss | 1 + 6 files changed, 36 insertions(+), 29 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html index 4fe8794a21..347b1f9d71 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html @@ -17,10 +17,10 @@ ~ under the License. --> - - - -
+
+
+
+
@@ -120,5 +120,5 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts index 31be5e7a96..836c265893 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts @@ -17,14 +17,16 @@ * under the License. */ -import { Component, ViewChild, OnInit, Output, EventEmitter } from '@angular/core'; +import { Component, ViewChild, OnInit, Output, EventEmitter, Inject } from '@angular/core'; import { FormGroup, FormBuilder } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { DateUtils, CheckUtils } from '../../../core/util'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import { DataengineConfigurationService } from '../../../core/services'; import { CLUSTER_CONFIGURATION } from '../../computational/computational-resource-create-dialog/cluster-configuration-templates'; +import { DebugRenderer2 } from '@angular/core/src/view/services'; @Component({ selector: 'detail-dialog', @@ -34,7 +36,6 @@ import { CLUSTER_CONFIGURATION } from '../../computational/computational-resourc export class DetailDialogComponent implements OnInit { readonly DICTIONARY = DICTIONARY; - notebook: any; upTimeInHours: number; upTimeSince: string = ''; @@ -43,31 +44,30 @@ export class DetailDialogComponent implements OnInit { public configurationForm: FormGroup; - @ViewChild('bindDialog') bindDialog; @ViewChild('configurationNode') configuration; - @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); - constructor( + @Inject(MAT_DIALOG_DATA) public data: any, private dataengineConfigurationService: DataengineConfigurationService, private _fb: FormBuilder, + public dialogRef: MatDialogRef, public toastr: ToastrService - ) {} - - ngOnInit() { - this.bindDialog.onClosing = () => this.resetDialog(); + ) { + this.notebook = data; } - public open(param, notebook): void { - this.tooltip = false; - this.notebook = notebook; - - this.upTimeInHours = (notebook.time) ? DateUtils.diffBetweenDatesInHours(this.notebook.time) : 0; - this.upTimeSince = (notebook.time) ? new Date(this.notebook.time).toString() : ''; - - this.initFormModel(); - this.getClusterConfiguration(); - this.bindDialog.open(param); + ngOnInit() { + // this.dialogRef.beforeClosed().subscribe(() => this.resetDialog()); + this.notebook; + + if (this.notebook) { + this.tooltip = false; + + this.upTimeInHours = (this.notebook.time) ? DateUtils.diffBetweenDatesInHours(this.notebook.time) : 0; + this.upTimeSince = (this.notebook.time) ? new Date(this.notebook.time).toString() : ''; + this.initFormModel(); + this.getClusterConfiguration(); + } } public isEllipsisActive($event): void { @@ -98,8 +98,7 @@ export class DetailDialogComponent implements OnInit { this.dataengineConfigurationService .editExploratorySparkConfiguration(data.configuration_parameters, this.notebook.name) .subscribe(result => { - this.bindDialog.close(); - this.buildGrid.emit(); + this.dialogRef.close(); }, error => this.toastr.error(error.message || 'Edit onfiguration failed!', 'Oops!')); } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts index 1571d71876..93d5332657 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts @@ -37,6 +37,7 @@ export * from './detail-dialog.component'; DirectivesModule ], declarations: [DetailDialogComponent], + entryComponents: [DetailDialogComponent], exports: [DetailDialogComponent] }) export class DetailDialogModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index d5536c7a7a..8585046582 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -153,9 +153,10 @@
{{notebook.template_name}}
+ + - diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 1a5564b48f..62dc198a6c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -20,6 +20,7 @@ import { Component, ViewChild, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; +import { MatDialog, MatDialogRef } from '@angular/material'; import { UserResourceService } from '../../core/services'; import { CreateResourceModel } from './create-resource.model'; @@ -28,6 +29,7 @@ import { FilterConfigurationModel } from './filter-configuration.model'; import { GeneralEnvironmentStatus } from '../../management/management.model'; import { ConfirmationDialogType } from '../../shared'; import { SortUtil } from '../../core/util'; +import { DetailDialogComponent } from '../exploratory/detail-dialog'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @@ -73,6 +75,7 @@ export class ResourcesGridComponent implements OnInit { constructor( private userResourceService: UserResourceService, + private dialog: MatDialog, public toastr: ToastrService ) {} @@ -276,7 +279,9 @@ export class ResourcesGridComponent implements OnInit { } printDetailEnvironmentModal(data): void { - this.detailDialog.open({ isFooter: false }, data); + // this.detailDialog.open({ isFooter: false }, data); + this.dialog.open(DetailDialogComponent, { data: data }) + .afterClosed().subscribe(() => this.buildGrid()); } printCostDetails(data): void { diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss index ee21e24085..aec654723a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss @@ -120,6 +120,7 @@ } } a.nav-item { + display: flex; position: relative; height: 56px; padding: 5px; From 4324148179df08a2567d51e3a3c9d9c8e168860a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 12:09:17 +0300 Subject: [PATCH 007/357] add project layout; apply routing configuration to navigation panel --- .../src/app/management/project/index.ts | 39 +++++++++++++++++++ .../management/project/project.component.html | 3 ++ .../management/project/project.component.scss | 0 .../management/project/project.component.ts | 34 ++++++++++++++++ .../app/shared/navbar/navbar.component.html | 20 ++++++---- .../app/shared/navbar/navbar.component.scss | 8 +++- 6 files changed, 96 insertions(+), 8 deletions(-) create mode 100644 services/self-service/src/main/resources/webapp/src/app/management/project/index.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/management/project/project.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/management/project/project.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/management/project/project.component.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/management/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/management/project/index.ts new file mode 100644 index 0000000000..6b8e0f40d1 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/management/project/index.ts @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { MaterialModule } from '../../shared/material.module'; +import { FormControlsModule } from '../../shared/form-controls'; + +import { ProjectComponent } from './project.component'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + MaterialModule, + FormControlsModule, + ], + declarations: [ProjectComponent], + exports: [ProjectComponent] +}) +export class ProjectModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.html new file mode 100644 index 0000000000..d1e1821e66 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.html @@ -0,0 +1,3 @@ +

+ project works! +

diff --git a/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.ts new file mode 100644 index 0000000000..75c222fe18 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.ts @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'dlab-project', + templateUrl: './project.component.html', + styleUrls: ['./project.component.scss'] +}) +export class ProjectComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index d947001432..8558fdc9aa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -29,7 +29,7 @@ @@ -73,17 +73,23 @@
- +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts index 365da5e114..89252ca633 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts @@ -17,8 +17,9 @@ * under the License. */ -import { Component, OnInit, EventEmitter, Output, ViewChild, ChangeDetectorRef } from '@angular/core'; +import { Component, OnInit, EventEmitter, Output, ViewChild, ChangeDetectorRef, Inject } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import { ExploratoryEnvironmentCreateModel } from './exploratory-environment-create.model'; @@ -33,7 +34,7 @@ import { CLUSTER_CONFIGURATION } from '../../computational/computational-resourc styleUrls: ['./create-environment.component.scss'] }) -export class ExploratoryEnvironmentCreateDialogComponent implements OnInit { +export class ExploratoryEnvironmentCreateComponent implements OnInit { readonly DICTIONARY = DICTIONARY; model: ExploratoryEnvironmentCreateModel; @@ -45,7 +46,6 @@ export class ExploratoryEnvironmentCreateDialogComponent implements OnInit { public createExploratoryEnvironmentForm: FormGroup; - @ViewChild('bindDialog') bindDialog; @ViewChild('environment_name') environment_name; @ViewChild('templatesList') templates_list; @ViewChild('shapesList') shapes_list; @@ -55,17 +55,21 @@ export class ExploratoryEnvironmentCreateDialogComponent implements OnInit { @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); constructor( + @Inject(MAT_DIALOG_DATA) public data: any, private userResourceService: UserResourceService, private _fb: FormBuilder, private changeDetector: ChangeDetectorRef, - public toastr: ToastrService + public toastr: ToastrService, + public dialogRef: MatDialogRef, ) { this.model = ExploratoryEnvironmentCreateModel.getDefault(userResourceService); + this.resourceGrid = data; } ngOnInit() { this.initFormModel(); - this.bindDialog.onClosing = () => this.resetDialog(); + // this.bindDialog.onClosing = () => this.resetDialog(); + this.open(); } initFormModel(): void { @@ -139,25 +143,24 @@ export class ExploratoryEnvironmentCreateDialogComponent implements OnInit { return false; } - public open(params): void { - if (!this.bindDialog.isOpened) { - this.model = new ExploratoryEnvironmentCreateModel('', '', '', '', '', - response => { - if (response.status === HTTP_STATUS_CODES.OK) { - this.close(); - this.buildGrid.emit(); - } - }, - error => this.toastr.error(error.message || 'Exploratory creation failed!', 'Oops!'), - () => this.templateDescription = this.model.selectedItem.description, - () => { - this.initFormModel(); - this.bindDialog.open(params); - this.setDefaultParams(); - this.getImagesList(); - }, - this.userResourceService); - } + public open(params?): void { + this.model.loadTemplates(); + this.model = new ExploratoryEnvironmentCreateModel('', '', '', '', '', + response => { + if (response.status === HTTP_STATUS_CODES.OK) { + this.dialogRef.close(); + // this.buildGrid.emit(); + } + }, + error => this.toastr.error(error.message || 'Exploratory creation failed!', 'Oops!'), + () => this.templateDescription = this.model.selectedItem.description, + () => { + this.initFormModel(); + // this.bindDialog.open(params); + this.setDefaultParams(); + this.getImagesList(); + }, + this.userResourceService); } getImagesList() { @@ -181,10 +184,10 @@ export class ExploratoryEnvironmentCreateDialogComponent implements OnInit { } } - public close(): void { - if (this.bindDialog.isOpened) - this.bindDialog.close(); - } + // public close(): void { + // if (this.bindDialog.isOpened) + // this.bindDialog.close(); + // } private resetDialog(): void { this.initFormModel(); diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts index 5bed5dc0f7..8160fae077 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts @@ -24,7 +24,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../../shared/material.module'; import { ModalModule } from '../../../shared'; import { FormControlsModule } from '../../../shared/form-controls'; -import { ExploratoryEnvironmentCreateDialogComponent } from './exploratory-environment-create-dialog.component'; +import { ExploratoryEnvironmentCreateComponent } from './exploratory-environment-create-dialog.component'; @NgModule({ imports: [ @@ -35,7 +35,8 @@ import { ExploratoryEnvironmentCreateDialogComponent } from './exploratory-envir FormControlsModule, MaterialModule ], - declarations: [ExploratoryEnvironmentCreateDialogComponent], - exports: [ExploratoryEnvironmentCreateDialogComponent] + declarations: [ExploratoryEnvironmentCreateComponent], + entryComponents: [ExploratoryEnvironmentCreateComponent], + exports: [ExploratoryEnvironmentCreateComponent] }) -export class ExploratoryEnvironmentCreateDialogModule {} +export class ExploratoryEnvironmentCreateModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 62dc198a6c..96b0047cd6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -20,7 +20,7 @@ import { Component, ViewChild, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; -import { MatDialog, MatDialogRef } from '@angular/material'; +import { MatDialog } from '@angular/material'; import { UserResourceService } from '../../core/services'; import { CreateResourceModel } from './create-resource.model'; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index e913ca473c..ba9bfd1fce 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -48,5 +48,5 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts index 8eac8608d6..9260cd9335 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts @@ -20,8 +20,10 @@ import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; import { Subscription } from 'rxjs'; import { ToastrService } from 'ngx-toastr'; +import { MatDialog } from '@angular/material'; import { ResourcesGridComponent } from './resources-grid/resources-grid.component'; +import { ExploratoryEnvironmentCreateComponent } from './exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component'; import { UserAccessKeyService, HealthStatusService } from '../core/services'; import { ResourcesGridRowModel } from './resources-grid/resources-grid.model'; import { HTTP_STATUS_CODES, FileUtils } from '../core/util'; @@ -45,16 +47,17 @@ export class ResourcesComponent implements OnInit, OnDestroy { subscriptions: Subscription = new Subscription(); constructor( + public toastr: ToastrService, private userAccessKeyService: UserAccessKeyService, private healthStatusService: HealthStatusService, - public toastr: ToastrService + private dialog: MatDialog ) { this.userUploadAccessKeyState = HTTP_STATUS_CODES.NOT_FOUND; } ngOnInit() { this.getEnvironmentHealthStatus(); - this.createAnalyticalModal.resourceGrid = this.resourcesGrid; + // this.createAnalyticalModal.resourceGrid = this.resourcesGrid; this.subscriptions.add(this.userAccessKeyService.accessKeyEmitter.subscribe(response => { if (response) this.userUploadAccessKeyState = response.status; @@ -70,7 +73,10 @@ export class ResourcesComponent implements OnInit, OnDestroy { public createNotebook_btnClick(): void { if (this.userUploadAccessKeyState === HTTP_STATUS_CODES.OK) { - if (!this.createAnalyticalModal.isOpened) this.createAnalyticalModal.open({ isFooter: false }); + // if (!this.createAnalyticalModal.isOpened) this.createAnalyticalModal.open({ isFooter: false }); + + this.dialog.open(ExploratoryEnvironmentCreateComponent, { data: this.resourcesGrid }) + .afterClosed().subscribe(() => this.refreshGrid()); } else { this.userAccessKeyService.initialUserAccessKeyCheck(); } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts index 59cfbadacd..6c28e27cc3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts @@ -24,7 +24,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../shared/material.module'; import { ResourcesComponent } from './resources.component'; import { ResourcesGridModule } from './resources-grid'; -import { ExploratoryEnvironmentCreateDialogModule } from './exploratory/exploratory-environment-create-dialog'; +import { ExploratoryEnvironmentCreateModule } from './exploratory/exploratory-environment-create-dialog'; import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; import { ConfirmDeleteAccountDialog } from './manage-ungit/manage-ungit.component'; import { @@ -42,7 +42,7 @@ import { ResourcesGridModule, ProgressDialogModule, UploadKeyDialogModule, - ExploratoryEnvironmentCreateDialogModule, + ExploratoryEnvironmentCreateModule, MaterialModule ], declarations: [ From d45fca8ef36181857211f208d0387bfcd382cb95 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 12:17:31 +0300 Subject: [PATCH 010/357] fixed redrawing of side navigation component --- .../self-service/src/main/resources/webapp/src/styles.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 399b7b9c2e..07054f887d 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -50,6 +50,9 @@ .mat-tab-header-pagination.mat-tab-header-pagination-before { display: none !important; } +.mat-drawer-container { + height: calc(100% - 48px); +} mat-chip.mat-chip { outline: none; From eeb4793a52a2d7970654734528c6e1955467017b Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 13:02:34 +0300 Subject: [PATCH 011/357] added administration as a top level on structure --- .../administration/administration.module.ts | 31 ++ .../backup-dilog/backup-dilog.component.html | 82 +++++ .../backup-dilog/backup-dilog.component.scss | 26 ++ .../backup-dilog/backup-dilog.component.ts | 75 +++++ .../app/administration/management/index.ts | 82 +++++ .../manage-environment-dilog.component.html | 73 +++++ .../manage-environment-dilog.component.scss | 87 ++++++ .../manage-environment-dilog.component.ts | 129 ++++++++ .../group-name-validarion.directive.ts | 37 +++ .../manage-roles-groups.component.html | 154 +++++++++ .../manage-roles-groups.component.scss | 292 ++++++++++++++++++ .../manage-roles-groups.component.ts | 192 ++++++++++++ .../management-grid.component.html | 161 ++++++++++ .../management-grid.component.scss | 40 +++ .../management-grid.component.ts | 172 +++++++++++ .../management/management.component.html | 55 ++++ .../management/management.component.scss | 37 +++ .../management/management.component.ts | 275 +++++++++++++++++ .../management/management.model.ts | 58 ++++ .../ssn-monitor/ssn-monitor.component.html | 117 +++++++ .../ssn-monitor/ssn-monitor.component.scss | 50 +++ .../ssn-monitor/ssn-monitor.component.ts | 59 ++++ .../src/app/administration/project/index.ts | 39 +++ .../project/project.component.html | 19 ++ .../project/project.component.scss | 18 ++ .../project/project.component.ts | 34 ++ 26 files changed, 2394 insertions(+) create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/administration.module.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/group-name-validarion.directive.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/administration.module.ts b/services/self-service/src/main/resources/webapp/src/app/administration/administration.module.ts new file mode 100644 index 0000000000..2ae70a45cc --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/administration.module.ts @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { ManagenementModule } from './management'; +import { ProjectModule } from './project'; + +@NgModule({ + imports: [CommonModule, ManagenementModule, ProjectModule], + declarations: [], + exports: [ManagenementModule, ProjectModule] +}) +export class AdministrationModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html new file mode 100644 index 0000000000..9c797ad667 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html @@ -0,0 +1,82 @@ + + + + +

Backup options

+ + +
+
+ + Configuration files + +
+
+ + User keys + +
+
+ + Database + +
+
+ + SSL Certificates + +
+
+ + JAR files + +
+
+ + Log files + +
+
+ + +
+
+ + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.scss new file mode 100644 index 0000000000..e27a7a443a --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.scss @@ -0,0 +1,26 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.hold-block { + padding: 5px 10px; + transition: all 0.4s ease-out; + &:hover { + color: #35afd5; + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts new file mode 100644 index 0000000000..8b8ed616b1 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit, ViewChild, Output, EventEmitter } from '@angular/core'; +import { DICTIONARY } from '../../../../dictionary/global.dictionary'; + +import { BackupOptionsModel } from '../management.model'; + +@Component({ + selector: 'dlab-backup-dilog', + templateUrl: './backup-dilog.component.html', + styleUrls: ['./backup-dilog.component.scss'] +}) +export class BackupDilogComponent implements OnInit { + readonly DICTIONARY = DICTIONARY; + public backupOptions: BackupOptionsModel = new BackupOptionsModel([], [], [], [], false, false); + public valid: boolean = true; + + @ViewChild('bindDialog') bindDialog; + @Output() backupOpts: EventEmitter<{}> = new EventEmitter(); + + ngOnInit() { + this.backupOptions.setDegault(); + this.bindDialog.onClosing = () => this.backupOptions.setDegault(); + } + + public open(param): void { + this.valid = true; + this.bindDialog.open(param); + } + + public onHoldChanged($event, key): void { + this.backupOptions[key] instanceof Array + ? (this.backupOptions[key][0] = $event.checked ? 'all' : 'skip') + : (this.backupOptions[key] = !this.backupOptions[key]); + + this.checkValidity(); + } + + public applyOptions(): void { + this.backupOpts.emit(this.backupOptions); + this.backupOptions.setDegault(); + this.bindDialog.close(); + } + + private checkValidity(): void { + const items = []; + + Object.keys(this.backupOptions).forEach(el => { + if (this.backupOptions[el] instanceof Array) { + if (this.backupOptions[el][0] && this.backupOptions[el][0] !== 'skip') items.push(this.backupOptions[el][0]); + } else { + if (this.backupOptions[el]) items.push(this.backupOptions[el]) ; + } + }); + + this.valid = items.length > 0; + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts new file mode 100644 index 0000000000..7d15b50f6f --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -0,0 +1,82 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; + +import { + ModalModule, + UploadKeyDialogModule, + ProgressDialogModule, + BubbleModule, + ConfirmationDialogModule +} from '../../shared'; +import { MaterialModule } from '../../shared/material.module'; + +import { ManagementComponent } from './management.component'; +import { ManagementGridComponent, ConfirmationDialogComponent } from './management-grid/management-grid.component'; +import { ComputationalResourcesModule } from '../../resources/computational/computational-resources-list'; + +import { FormControlsModule } from '../../shared/form-controls'; +import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; +import { ManageEnvironmentComponent, ConfirmActionDialogComponent } from './manage-environment/manage-environment-dilog.component'; + +import { GroupNameValidationDirective } from './manage-roles-groups/group-name-validarion.directive'; +import { DirectivesModule } from '../../core/directives'; + +import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; +import { ManageRolesGroupsComponent, ConfirmDeleteUserAccountDialogComponent } from './manage-roles-groups/manage-roles-groups.component'; +import { ProjectModule } from '../project'; + +export * from './management.component'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + ProjectModule, + ModalModule, + UploadKeyDialogModule, + ProgressDialogModule, + BubbleModule, + ConfirmationDialogModule, + ComputationalResourcesModule, + FormControlsModule, + DirectivesModule, + MaterialModule + ], + declarations: [ + ManagementComponent, + ManagementGridComponent, + + GroupNameValidationDirective, + BackupDilogComponent, + ManageEnvironmentComponent, + ConfirmationDialogComponent, + ConfirmActionDialogComponent, + ConfirmDeleteUserAccountDialogComponent, + SsnMonitorComponent, + ManageRolesGroupsComponent + ], + entryComponents: [ConfirmationDialogComponent, ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent], + exports: [ManagementComponent] +}) +export class ManagenementModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html new file mode 100644 index 0000000000..094ec9b1d6 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html @@ -0,0 +1,73 @@ + + + + +

Manage environment

+ + +
+
+
+ + +
User
+
Limit
+
Actions
+ +
+ +
{{ manageUsersForm.controls['users'].controls[i].value['name'] }}
+
+ + Only positive integers are allowed + Per-user quotes cannot be greater than total budget +
+
+ pause_circle_outline + + + + pause_circle_outline + + + + phonelink_off +
+ +
+
+ +
+ + Total budget cannot be lower than a sum of users quotes +
+
+
+ + +
+ +
+
+
No active users environments
+
+ + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.scss new file mode 100644 index 0000000000..b268e6f287 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.scss @@ -0,0 +1,87 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.manage-env-dialog { + .mat-list { + .mat-list-item { + height: 60px; + position: relative; + .mat-list-item-content { + padding: 0 !important; + justify-content: space-between; + color: #577289; + } + } + } + .scrolling-content { + max-height: 300px; + min-height: 85px; + overflow-y: auto; + } + .username { + width: 45%; + } + .quotes { + width: 40%; + margin-right: 10px; + position: relative; + .danger_color { + position: absolute; + left: 0; + top: 36px; + } + } + .action { + width: 15%; + span { + padding: 3px; + cursor: pointer; + &:hover { + color: #35afd5; + } + i { + font-size: 20px; + } + } + .disabled { + cursor: not-allowed !important; + pointer-events: all; + opacity: .6; + &:hover { + color: #6b8299; + } + } + } + .total-budget { + border-top: 1px solid #edf1f5; + padding-top: 15px; + .control { + position: relative; + width: 56%; + .danger_color { + position: absolute; + left: 0; + bottom: -20px; + } + } + .label { + width: 44%; + } + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts new file mode 100644 index 0000000000..ae7d7d11f3 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts @@ -0,0 +1,129 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, ViewChild, Output, EventEmitter, ViewEncapsulation, Inject } from '@angular/core'; +import { Validators, FormBuilder, FormGroup, FormArray } from '@angular/forms'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { DICTIONARY } from '../../../../dictionary/global.dictionary'; + +@Component({ + selector: 'dlab-manage-env-dilog', + templateUrl: './manage-environment-dilog.component.html', + styleUrls: ['./manage-environment-dilog.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class ManageEnvironmentComponent { + readonly DICTIONARY = DICTIONARY; + public usersList: Array = []; + public manageUsersForm: FormGroup; + public manageTotalsForm: FormGroup; + + @ViewChild('bindDialog') bindDialog; + @Output() manageEnv: EventEmitter<{}> = new EventEmitter(); + @Output() setBudget: EventEmitter<{}> = new EventEmitter(); + + constructor( + private _fb: FormBuilder, + public dialog: MatDialog + ) { } + + get usersEnvironments(): FormArray { + return this.manageUsersForm.get('users'); + } + + public open(param, data, settings): void { + this.usersList = data; + !this.manageUsersForm && this.initForm(); + + this.manageUsersForm.setControl('users', + this._fb.array((this.usersList || []).map((x: any) => this._fb.group({ + name: x.name, budget: [x.budget, [Validators.min(0), this.userValidityCheck.bind(this)]], status: x.status + })))); + this.manageUsersForm.controls['total'].setValue(settings.conf_max_budget || null); + this.bindDialog.open(param); + } + + public setBudgetLimits(value) { + this.setBudget.emit(value); + this.bindDialog.close(); + } + + public applyAction(action, user) { + const dialogRef: MatDialogRef = this.dialog.open( + ConfirmActionDialogComponent, { data: {action, user: user.value.name}, width: '550px', panelClass: 'error-modalbox' }); + dialogRef.afterClosed().subscribe(result => { + if (result) this.manageEnv.emit({action, user: user.value.name}); + }); + } + + private initForm(): void { + this.manageUsersForm = this._fb.group({ + total: [null, [Validators.min(0), this.totalValidityCheck.bind(this)]], + users: this._fb.array([this._fb.group({ name: '', budget: null, status: ''})]) + }); + } + + private getCurrentUsersTotal(): number { + return this.manageUsersForm.value.users.reduce((memo, el) => memo += el.budget, 0); + } + + private getCurrentTotalValue(): number { + return this.manageUsersForm.value.total; + } + + private totalValidityCheck(control) { + return (control && control.value) + ? (control.value >= this.getCurrentUsersTotal() ? null : { overrun: true }) + : null; + } + + private userValidityCheck(control) { + if (control && control.value) { + return (this.getCurrentTotalValue() && this.getCurrentTotalValue() < this.getCurrentUsersTotal()) ? { overrun: true } : null; + } + } +} + +@Component({ + selector: 'dialog-result-example-dialog', + template: ` +
+

{{ data.action }} resource

+ +
+
+

Environment of {{ data.user }} will be + terminated. + stopped. +

+

Do you want to proceed?

+
+
+ + +
+ `, + styles: [] +}) +export class ConfirmActionDialogComponent { + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) { } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/group-name-validarion.directive.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/group-name-validarion.directive.ts new file mode 100644 index 0000000000..e3f720718a --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/group-name-validarion.directive.ts @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Directive, forwardRef, Input } from '@angular/core'; +import { AbstractControl, NG_VALIDATORS, Validator } from '@angular/forms'; + +@Directive({ + selector: '[validator][ngModel],[group-dir][ngFormControl]', + providers: [{ + multi: true, + provide: NG_VALIDATORS, + useExisting: forwardRef(() => GroupNameValidationDirective) + }] +}) +export class GroupNameValidationDirective implements Validator { + @Input() validator: Function; + + validate(control: AbstractControl): { [key: string]: any; } { + return this.validator(control); + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html new file mode 100644 index 0000000000..85b751b493 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html @@ -0,0 +1,154 @@ + + + + +

Manage roles

+ + +
+ + + + Groups +
+ +
Group name can only contain letters, numbers, hyphens and '_'
+
Group name already exists
+
+
+ + +
+ + + Roles +
+
+ + + + + + playlist_add_check All + + + clear None + + + + {{ role }} + + + + +
+
+
+ + + +
+ + + Users +
+ +
+
+ + + +
+ + + +
+ + + + + + + + + + + + + +
NameRolesUsersAction
{{ item.group }} +
+ + + + + playlist_add_check All + + + clear None + + + + {{ role }} + + + + +
+ 		+ + + + +
+ + + {{ user }} + clear + + +
+ 		+ + + +
+
+
+ + + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.scss new file mode 100644 index 0000000000..b28c061c3d --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.scss @@ -0,0 +1,292 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +::ng-deep .mat-option:first-child .mat-pseudo-checkbox { display: none; } + +.caret { + width: 40px; + color: #4ab8dc; + border: none; + border-left: 1px solid #ececec; + background-color: #fff; + position: absolute; + right: 0; + top: 0px; + height: 36px; + cursor: pointer; + &.not-allowed { + background-color: #dcdcdc; + } +} + + +.content-box { + padding: 20px 30px 35px; + height: 85vh; + overflow-y: auto; +} +.no-details { + color: #d8d8d8; +} +.mat-divider { + margin: 10px 0; +} +.stepper { + height: 190px; + margin-top: 10px; + .inner-step { + height: 70px; + padding: 5px; + display: flex; + justify-content: center; + flex-direction: column; + text-align: center; + input { + width: 490px; + align-self: center; + } + .caret { + i { + margin-top: 3px; + } + } + } + .text-center { + button { + &:not(:last-child) { + margin-right: 5px; + } + } + } +} +.selector-wrapper { + display: flex; + align-self: center; + width: 490px; + height: 36px; + padding-left: 10px; + font-family: 'Open Sans', sans-serif; + font-size: 15px; + font-weight: 300; + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + mat-form-field { + width: 100%; + .mat-form-field-wrapper { + padding-bottom: 0; + } + .mat-icon { + font-size: 20px; + } + } + .dropdown-multiselect { + width: 100% !important; + > button { + padding: 6px 22px; + } + } +} +.list-header { + padding: 0 15px; +} +.scrolling-content { + max-height: 450px; + overflow-x: hidden; + overflow-y: auto; + display: block; + padding: 15px 5px; + &.stepper-opened { + height: 250px; + } +} +.roles { + width: 30%; + padding: 0 10px; + .selector-wrapper-edit { + position: relative; + display: flex; + justify-content: space-between; + height: 36px; + padding-left: 10px; + background: #fff; + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + multi-select-dropdown { + width: 100%; + .dropdown-multiselect { + > button { + padding: 8px 22px 5px; + } + } + } + .caret { + &:hover { + box-shadow: 0 3px 1px -10px rgba(0, 0, 0, 0.2), 0 2px 1px 0 rgba(0, 0, 0, 0.17), 0 1px 5px 0 rgba(0, 0, 0, 0.12) + } + } + } +} +.groups { + width: 20%; +} +.users { + width: 30%; + padding: 0 10px; +} +.users-list { + padding: 5px 10px; + font-family: 'Open Sans', sans-serif; + font-size: 15px; + font-weight: 300; + color: #577289; + position: relative; + i { + color: #FF5722; + font-size: 18px; + cursor: pointer; + } + .list-selected { + width: 100%; + margin-top: 50px; + height: inherit; + min-height: 0; + overflow-y: hidden; + } +} +.expanded-panel { + display: flex; + align-items: flex-end; + .add-input-block { + display: flex; + height: 36px; + padding-right: 0; + outline: none; + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + input { + height: 36px; + padding: 0; + padding-left: 10px; + width: 170px; + } + .caret { + width: 50px; + } + } +} + + +mat-expansion-panel-header { + &.mat-expansion-panel-header { + font-family: 'Open Sans', sans-serif; + font-size: 15px; + font-weight: 300; + color: #577289; + } +} + +.mat-step-header { + .mat-step-icon { + background-color: #36afd5 !important; + } + .mat-step-label { + font-family: 'Open Sans', sans-serif; + font-size: 16px; + font-weight: 300; + } +} + +.dashboard_table { + .dashboard_table_body { + .actions { + padding: 10px 0; + } + &.filter-row { + .actions { + button { + background: none; + .mid { + vertical-align: sub; + } + } + } + } + } + .th_actions { + width: 10%; + } +} + +.mat-chip:not(.mat-basic-chip) { + transition: box-shadow 280ms cubic-bezier(.4,0,.2,1); + padding: 7px 0 7px 10px; + border-radius: 24px; + cursor: default; + display: inline-block; + position: relative; + padding-right: 25px; + white-space: nowrap; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + margin: 2px !important; +} +mat-chip.mat-chip a { + position: absolute; + right: 15px; +} +mat-form-field.chip-list { + &.mat-form-field { + position: absolute; + top: 2px; + width: 94%; + font-size: 16px; + font-weight: 300; + } +} + +.mat-raised-button { + &.butt { + &.butt-success { + margin-left: 0; + } + } +} +.multiple-select { + border-bottom: 1px solid #dedbdb; + padding: 0; + a { + display: inline-block; + width: 50%; + padding: 0 15px; + vertical-align: middle; + color: #575757; + cursor: pointer; + i { + vertical-align: sub; + font-size: 20px; + } + &:hover { + color: #4eaf3e; + background: #f9fafb; + } + &.deselect { + &:hover { + color: #f1696e; + } + } + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.ts new file mode 100644 index 0000000000..bc91c947fd --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.ts @@ -0,0 +1,192 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit, ViewChild, Output, EventEmitter, Inject } from '@angular/core'; +import { ValidatorFn, FormControl, NgModel } from '@angular/forms'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { DICTIONARY } from '../../../../dictionary/global.dictionary'; + +@Component({ + selector: 'dlab-manage-roles-groups', + templateUrl: './manage-roles-groups.component.html', + styleUrls: ['../../../resources/resources-grid/resources-grid.component.css', './manage-roles-groups.component.scss'] +}) +export class ManageRolesGroupsComponent implements OnInit { + readonly DICTIONARY = DICTIONARY; + + public groupsData: Array = []; + public roles: Array = []; + public rolesList: Array = []; + public setupGroup: string = ''; + public setupUser: string = ''; + public manageUser: string = ''; + public setupRoles: Array = []; + public updatedRoles: Array = []; + public delimitersRegex = /[-_]?/g; + public groupnamePattern = new RegExp(/^[a-zA-Z0-9_\-]+$/); + + @ViewChild('bindDialog') bindDialog; + @Output() manageRolesGroupAction: EventEmitter<{}> = new EventEmitter(); + stepperView: boolean = false; + + constructor(public dialog: MatDialog) { } + + ngOnInit() { + this.bindDialog.onClosing = () => this.resetDialog(); + } + + public open(param, groups, roles): void { + this.roles = roles; + this.rolesList = roles.map(role => role.description); + this.updateGroupData(groups); + + this.stepperView = false; + this.bindDialog.open(param); + } + + public onUpdate($event) { + if ($event.type === 'role') { + this.setupRoles = $event.model; + } else { + this.updatedRoles = $event.model; + } + $event.$event.preventDefault(); + } + + public selectAllOptions(item, values, byKey?) { + byKey ? (item[byKey] = values ? values : []) : this.setupRoles = values ? values : []; + } + + public manageAction(action: string, type: string, item?: any, value?) { + if (action === 'create') { + this.manageRolesGroupAction.emit( + { action, type, value: { + name: this.setupGroup, + users: this.setupUser ? this.setupUser.split(',').map(elem => elem.trim()) : [], + roleIds: this.extractIds(this.roles, this.setupRoles) + } + }); + this.stepperView = false; + } else if (action === 'delete') { + const data = (type === 'users') ? {group: item.group, user: value} : {group: item.group, id: item}; + const dialogRef: MatDialogRef = this.dialog.open( + ConfirmDeleteUserAccountDialogComponent, + { data: data, width: '550px', panelClass: 'error-modalbox' } + ); + + dialogRef.afterClosed().subscribe(result => { + if (result) { + const emitValue = (type === 'users') + ? {action, type, id: item.name, value: { user: value, group: item.group }} + : {action, type, id: item.name, value: item.group} ; + this.manageRolesGroupAction.emit(emitValue); + } + }); + } else if (action === 'update') { + this.manageRolesGroupAction.emit({action, type, value: { + name: item.group, + roleIds: this.extractIds(this.roles, item.selected_roles), + users: item.users || [] }}); + } + this.resetDialog(); + } + + public extractIds(sourceList, target) { + return sourceList.reduce((acc, item) => { + target.includes(item.description) && acc.push(item._id); + return acc; + }, []); + } + + public updateGroupData(groups) { + this.groupsData = groups; + + this.groupsData.forEach(item => { + item.selected_roles = item.roles.map(role => role.description); + }); + } + + public groupValidarion(): ValidatorFn { + + const duplicateList: any = this.groupsData.map(item => item.group); + return ((control: FormControl) => { + if (control.value && duplicateList.includes(this.delimitersFiltering(control.value))) + return { duplicate: true }; + + if (control.value && !this.groupnamePattern.test(control.value)) + return { patterns: true }; + + return null; + }); + } + + public compareObjects(o1: any, o2: any): boolean { + return o1.toLowerCase() === o2.toLowerCase(); + } + + public delimitersFiltering(resource): string { + return resource.replace(this.delimitersRegex, '').toString().toLowerCase(); + } + + public resetDialog() { + this.stepperView = false; + this.setupGroup = ''; + this.setupUser = ''; + this.manageUser = ''; + this.setupRoles = []; + this.updatedRoles = []; + } + + public removeUser(list, item): void { + list.splice(list.indexOf(item), 1); + } + + public addUser(value: string, item): void { + if (value && value.trim()) { + item.users instanceof Array ? item.users.push(value.trim()) : item.users = [value.trim()]; + } + } +} + + +@Component({ + selector: 'dialog-result-example-dialog', + template: ` +
+

priority_highWarning

+ +
+
+

User {{ data.user }} will be deleted from {{ data.group }} group.

+

Group {{ data.group }} will be decommissioned.

+

Do you want to proceed?

+
+
+ + +
+ `, + styles: [] +}) +export class ConfirmDeleteUserAccountDialogComponent { + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) { } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html new file mode 100644 index 0000000000..6b8bb95c0e --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + +
UserNameStatusShape / Resource idComputational resourcesAction
{{ env.user }}{{ env.name }}{{env.status}}{{ env.shape || env.ip }} +
+
+ no details +
+ +
+ 		+ + +
    +
  • +
    + pause_circle_outline + Stop +
    +
    • +
  • +
    + phonelink_off + Terminate +
    +
    • + +
    +
  • + play_circle_outline + Start +
    • +
  • + refresh + Recreate +
    • +
  • + sync_problem + Reupload key +
    • +
    +
+ +
+ + + + + + + + + + + + + + + +
TypeResource idStatusAction
{{env.type}}{{env.resource_id}}{{env.status}} + + + + +
    +
  • + pause_circle_outline + Stop +
    • +
  • + play_circle_outline + Start +
    • +
  • + refresh + Recreate +
    • +
  • + sync_problem + Reupload key +
    • +
+ +
+ + + + + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss new file mode 100644 index 0000000000..6198578416 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss @@ -0,0 +1,40 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.dashboard_table { + .th_user, + .th_name { + width: 20%; + } + .th_shape, + .th_status { + width: 12% !important; + } + .th_resources { + width: 33%; + } + .dashboard_table_body { + td:first-child { + cursor: default; + } + } +} +.source .resource-wrap .resource-name .detailed-link { + cursor: default !important; +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts new file mode 100644 index 0000000000..7cc28e82ae --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts @@ -0,0 +1,172 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit, ViewChild, Input, Output, EventEmitter, Inject } from '@angular/core'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { ToastrService } from 'ngx-toastr'; + +import { HealthStatusService, UserAccessKeyService } from '../../../core/services'; +import { ConfirmationDialogType } from '../../../shared'; +import { FileUtils } from '../../../core/util'; + +export interface ManageAction { + action: string; + environment: string; + resource: string; +} + +@Component({ + selector: 'management-grid', + templateUrl: 'management-grid.component.html', + styleUrls: [ + './management-grid.component.scss', + '../../../resources/resources-grid/resources-grid.component.css', + '../../../resources/computational/computational-resources-list/computational-resources-list.component.scss' + ] +}) +export class ManagementGridComponent implements OnInit { + @Input() allEnvironmentData: Array; + @Input() environmentsHealthStatuses: Array; + @Input() healthStatus: string; + @Input() resources: Array; + @Input() uploadKey: boolean; + @Input() isAdmin: boolean; + @Input() currentUser: string = ''; + @Output() refreshGrid: EventEmitter<{}> = new EventEmitter(); + @Output() actionToggle: EventEmitter = new EventEmitter(); + + @ViewChild('confirmationDialog') confirmationDialog; + @ViewChild('keyReuploadDialog') keyReuploadDialog; + + constructor( + private healthStatusService: HealthStatusService, + private userAccessKeyService: UserAccessKeyService, + public toastr: ToastrService, + public dialog: MatDialog + ) {} + + ngOnInit() { + } + + buildGrid(): void { + this.refreshGrid.emit(); + } + + toggleResourceAction(environment, action: string, resource?) { + if (resource) { + const resource_name = resource ? resource.computational_name : environment.name; + const dialogRef: MatDialogRef = this.dialog.open(ConfirmationDialogComponent, { + data: { action, resource_name, user: environment.user }, + width: '550px', + panelClass: 'error-modalbox' + }); + dialogRef.afterClosed().subscribe(result => { + result && this.actionToggle.emit({ action, environment, resource }); + }); + } else { + if (action === 'stop') { + this.confirmationDialog.open( + { isFooter: false }, + environment, + (environment.name === 'edge node' || environment.type.toLowerCase() === 'edge node') + ? ConfirmationDialogType.StopEdgeNode + : ConfirmationDialogType.StopExploratory, + ); + } else if (action === 'terminate') { + this.confirmationDialog.open({ isFooter: false }, environment, ConfirmationDialogType.TerminateExploratory); + } else if (action === 'run') { + this.healthStatusService + .runEdgeNode() + .subscribe(() => { + this.buildGrid(); + this.toastr.success('Edge node is starting!', 'Processing!'); + }, error => this.toastr.error('Edge Node running failed!', 'Oops!')); + } else if (action === 'recreate') { + this.healthStatusService + .recreateEdgeNode() + .subscribe(() => { + this.buildGrid(); + this.toastr.success('Edge Node recreation is processing!', 'Processing!'); + }, error => this.toastr.error('Edge Node recreation failed!', 'Oops!')); + } + } + } + + isResourcesInProgress(notebook) { + if (notebook) { + if (notebook.name === 'edge node') { + return this.allEnvironmentData + .filter(env => env.user === notebook.user) + .some(el => this.inProgress([el]) || this.inProgress(el.resources)); + } else if (notebook.resources.length) { + return this.inProgress(notebook.resources); + } + } + return false; + } + + inProgress(resources) { + return resources.filter(resource => ( + resource.status !== 'failed' + && resource.status !== 'terminated' + && resource.status !== 'running' + && resource.status !== 'stopped')).length > 0; + } + + showReuploaKeydDialog() { + this.keyReuploadDialog.open({ isFooter: false }); + } + + public generateUserKey() { + this.userAccessKeyService.regenerateAccessKey().subscribe(data => { + FileUtils.downloadFile(data); + this.buildGrid(); + }); + } +} + + +@Component({ + selector: 'confirm-dialog', + template: ` +
+

{{ data.action }} resource

+ +
+
+

Resource {{ data.resource_name }} of user {{ data.user }} will be + decommissioned. + stopped. +

+

Do you want to proceed?

+
+
+ + +
+ `, + styles: [ + ] +}) +export class ConfirmationDialogComponent { + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) {} +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html new file mode 100644 index 0000000000..b0b2788cb0 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -0,0 +1,55 @@ + + +
+
+ + + + +
+ +
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.scss new file mode 100644 index 0000000000..ee18db9f73 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.scss @@ -0,0 +1,37 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.sub-nav { + justify-content: flex-end; + .admin-group { + margin-right: 10px; + } + button { + margin-right: 10px; + &:last-child { + margin-right: 0; + } + &.env { + width: 210px; + } + &.ssn { + width: inherit; + } + } +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts new file mode 100644 index 0000000000..d898b8461a --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -0,0 +1,275 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; +import { ToastrService } from 'ngx-toastr'; +import { Subscription } from 'rxjs'; + +import { + HealthStatusService, + ManageEnvironmentsService, + UserAccessKeyService, + BackupService, + UserResourceService, + RolesGroupsService, + StorageService +} from '../../core/services'; + +import { EnvironmentModel, GeneralEnvironmentStatus } from './management.model'; +import { HTTP_STATUS_CODES } from '../../core/util'; + +@Component({ + selector: 'environments-management', + templateUrl: './management.component.html', + styleUrls: ['./management.component.scss'] +}) +export class ManagementComponent implements OnInit, OnDestroy { + public user: string = ''; + public healthStatus: GeneralEnvironmentStatus; + public allEnvironmentData: Array; + public uploadKey: boolean = true; + public anyEnvInProgress: boolean = false; + public notebookInProgress: boolean = false; + + private subscriptions: Subscription = new Subscription(); + private clear = undefined; + + @ViewChild('backupDialog') backupDialog; + @ViewChild('manageEnvDialog') manageEnvironmentDialog; + @ViewChild('keyUploadModal') keyUploadDialog; + @ViewChild('preloaderModal') preloaderDialog; + @ViewChild('ssnMonitor') ssnMonitorDialog; + @ViewChild('rolesGroupsModal') rolesGroupsDialog; + + constructor( + private healthStatusService: HealthStatusService, + private backupService: BackupService, + private manageEnvironmentsService: ManageEnvironmentsService, + private userAccessKeyService: UserAccessKeyService, + private userResourceService: UserResourceService, + private rolesService: RolesGroupsService, + private storageService: StorageService, + public toastr: ToastrService + ) {} + + ngOnInit() { + this.buildGrid(); + this.user = this.storageService.getUserName(); + this.subscriptions.add(this.userAccessKeyService.accessKeyEmitter + .subscribe(result => this.uploadKey = (result && result.status === 200))); + + this.subscriptions.add(this.userAccessKeyService.keyUploadProccessEmitter.subscribe(response => { + if (response) this.buildGrid(); + })); + } + + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } + + public buildGrid() { + this.getEnvironmentHealthStatus(); + } + + public manageEnvironmentAction($event) { + this.manageEnvironmentsService + .environmentManagement( + $event.environment.user, + $event.action, + $event.environment.name === 'edge node' ? 'edge' : $event.environment.name, + $event.resource ? $event.resource.computational_name : null + ).subscribe( + () => this.buildGrid(), + error => this.toastr.error('Environment management failed!', 'Oops!')); + } + + showBackupDialog() { + if (!this.backupDialog.isOpened) this.backupDialog.open({ isFooter: false }); + } + + getActiveUsersList() { + return this.healthStatusService.getActiveUsers(); + } + + getTotalBudgetData() { + return this.healthStatusService.getTotalBudgetData(); + } + + openManageEnvironmentDialog() { + this.getActiveUsersList().subscribe(usersList => { + this.getTotalBudgetData().subscribe(total => this.manageEnvironmentDialog.open({ isFooter: false }, usersList, total)); + }, + () => this.toastr.error('Failed users list loading!', 'Oops!')); + } + + openSsnMonitorDialog() { + this.healthStatusService.getSsnMonitorData() + .subscribe(data => this.ssnMonitorDialog.open({ isFooter: false }, data), + () => this.toastr.error('Failed ssn data loading!', 'Oops!')); + } + + openManageRolesDialog() { + this.rolesService.getGroupsData().subscribe(group => { + this.rolesService.getRolesData().subscribe( + roles => this.rolesGroupsDialog.open({ isFooter: false }, group, roles), + error => this.toastr.error(error.message, 'Oops!')); + }, + error => this.toastr.error(error.message, 'Oops!')); + } + + isEnvironmentsInProgress(data): boolean { + return data.exploratory.some(el => { + return el.status === 'creating' || el.status === 'starting' || + el.computational_resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring'); + }); + } + + isNotebookInProgress(data): boolean { + return data.exploratory.some(el => el.status === 'creating'); + } + + createBackup($event) { + this.backupService.createBackup($event).subscribe(result => { + this.getBackupStatus(result); + this.toastr.success('Backup configuration is processing!', 'Processing!'); + this.clear = window.setInterval(() => this.getBackupStatus(result), 3000); + }, + error => this.toastr.error(error.message, 'Oops!')); + } + + manageRolesGroups($event) { + switch ($event.action) { + case 'create': + this.rolesService.setupNewGroup($event.value).subscribe(res => { + this.toastr.success('Group creation success!', 'Created!'); + this.getGroupsData(); + }, () => this.toastr.error('Group creation failed!', 'Oops!')); + break; + case 'update': + this.rolesService.updateGroup($event.value).subscribe(res => { + this.toastr.success('Group data successfully updated!', 'Success!'); + this.getGroupsData(); + }, () => this.toastr.error('Failed group data updating!', 'Oops!')); + break; + case 'delete': + if ($event.type === 'users') { + this.rolesService.removeUsersForGroup($event.value).subscribe(res => { + this.toastr.success('Users was successfully deleted!', 'Success!'); + this.getGroupsData(); + }, () => this.toastr.error('Failed users deleting!', 'Oops!')); + } else if ($event.type === 'group') { + console.log('delete group'); + this.rolesService.removeGroupById($event.value).subscribe(res => { + this.toastr.success('Group was successfully deleted!', 'Success!'); + this.getGroupsData(); + }, () => this.toastr.error('Failed group deleting!', 'Oops!')); + } + break; + default: + } + } + + setBudgetLimits($event) { + this.healthStatusService.updateUsersBudget($event.users).subscribe((result: any) => { + this.healthStatusService.updateTotalBudgetData($event.total).subscribe((res: any) => { + result.status === HTTP_STATUS_CODES.OK + && res.status === HTTP_STATUS_CODES.NO_CONTENT + && this.toastr.success('Budget limits updated!', 'Success!'); + this.buildGrid(); + }); + }, error => this.toastr.error(error.message, 'Oops!')); + } + + getGroupsData() { + this.rolesService.getGroupsData().subscribe( + list => this.rolesGroupsDialog.updateGroupData(list), + error => this.toastr.error(error.message, 'Oops!')); + } + + manageEnvironment(event: {action: string, user: string}) { + this.healthStatusService + .manageEnvironment(event.action, event.user) + .subscribe(res => { + this.getActiveUsersList().subscribe(usersList => { + this.manageEnvironmentDialog.usersList = usersList; + this.toastr.success(`Action ${ event.action } is processing!`, 'Processing!'); + this.buildGrid(); + }); + }, + error => this.toastr.error(error.message, 'Oops!')); + } + + private getExploratoryList() { + this.userResourceService.getUserProvisionedResources() + .subscribe((result) => { + this.anyEnvInProgress = this.isEnvironmentsInProgress(result); + this.notebookInProgress = this.isNotebookInProgress(result); + }); + } + + private getBackupStatus(result) { + const uuid = result.body; + this.backupService.getBackupStatus(uuid) + .subscribe((backupStatus: any) => { + if (!this.creatingBackup) { + backupStatus.status === 'FAILED' + ? this.toastr.error('Backup configuration failed!', 'Oops!') + : this.toastr.success('Backup configuration completed!', 'Success!'); + clearInterval(this.clear); + } + }, () => { + clearInterval(this.clear); + this.toastr.error('Backup configuration failed!', 'Oops!'); + }); + } + + get creatingBackup(): boolean { + return this.backupService.inProgress; + } + + private getAllEnvironmentData() { + this.manageEnvironmentsService + .getAllEnvironmentData() + .subscribe((result: Array) => this.allEnvironmentData = this.loadEnvironmentList(result)); + } + + private loadEnvironmentList(data): Array { + if (data) + return data.map(value => new EnvironmentModel( + value.resource_name || value.resource_type, + value.status, + value.shape, + value.computational_resources, + value.user, + value.public_ip, + value.resource_type + )); + } + + private getEnvironmentHealthStatus() { + this.healthStatusService + .getEnvironmentStatuses() + .subscribe((status: GeneralEnvironmentStatus) => { + this.healthStatus = status; + this.healthStatus.admin && this.getAllEnvironmentData(); + this.userAccessKeyService.initialUserAccessKeyCheck(); + this.getExploratoryList(); + }); + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts new file mode 100644 index 0000000000..51ab7212da --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export class EnvironmentModel { + constructor( + public name: string, + public status: string, + public shape: string, + public resources: Array, + public user: string, + public ip: string, + public type?: string + ) { } +} + +export class BackupOptionsModel { + constructor( + public configFiles: Array, + public keys: Array, + public certificates: Array, + public jars: Array, + public databaseBackup: boolean, + public logsBackup: boolean + ) { } + + setDegault(): void { + this.configFiles = ['all']; + this.keys = ['all']; + this.certificates = ['skip']; + this.jars = ['skip']; + this.databaseBackup = true; + this.logsBackup = false; + } +} + +export interface GeneralEnvironmentStatus { + admin: boolean; + billingEnabled: boolean; + billingQuoteUsed: number; + list_resources: any; + status: string; +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html new file mode 100644 index 0000000000..3d132661dc --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html @@ -0,0 +1,117 @@ + + + + +

SSN Monitor

+ + +
+
+ + +
+ +
Name
+
{{ monitorData.processorInfo.name }}
+ + +
Vendor
+
{{ monitorData.processorInfo.vendor }}
+ + +
Logical Core Count
+
{{ monitorData.processorInfo.logicalCoreCount }}
+ + +
Physical Core Count
+
{{ monitorData.processorInfo.physicalCoreCount }}
+ + +
Current System Load
+
{{ monitorData.processorInfo.currentSystemLoad /100 | percent:'1.0-2' }}
+ + +
System Load Average
+
{{ monitorData.processorInfo.systemLoadAverage /100 | percent:'1.0-2' }}
+ + +
CPU 64 Bit
+
{{ monitorData.processorInfo.cpu64Bit }}
+ +
+ + + +
+ +
Available Memory
+
{{ convertSize(monitorData.memoryInfo.availableMemory) }}
+ + +
Total Memory
+
{{ convertSize(monitorData.memoryInfo.totalMemory) }}
+ + +
Swap Total
+
{{ convertSize(monitorData.memoryInfo.swapTotal) }}
+ + +
Swap Used
+
{{ convertSize(monitorData.memoryInfo.swapUsed) }}
+ + +
Pages Page In
+
{{ convertSize(monitorData.memoryInfo.pagesPageIn) }}
+ + +
Pages Page Out
+
{{ convertSize(monitorData.memoryInfo.pagesPageOut) }}
+ +
+ + + +
+
+ +
Disk {{i +1}}
+ + +
Used Space
+
{{ convertSize(disk.usedByteSpace) }}
+ + +
Total Space
+
{{ convertSize(disk.totalByteSpace) }}
+ +
+
+ + +
+ +
+
+
+ No ssn monitor data available +
+
+ + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.scss new file mode 100644 index 0000000000..769fefeeef --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.scss @@ -0,0 +1,50 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.ssn-monitor-dialog { + .content-box { + padding-top: 10px !important; + } + .ssn-info { + min-height: 400px; + max-height: 500px; + .scrolling-content { + max-height: 310px; + overflow-y: auto; + } + .text-center { + position: absolute; + bottom: 20px; + left: 0; + right: 0; + } + } + .mat-list-item-content { + display: flex; + justify-content: initial; + color: #577289; + padding: 15px 5px; + border-bottom: 1px solid #f3f2f2; + font-size: 15px; + .col { + width: 50%; + font-weight: 300; + } + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts new file mode 100644 index 0000000000..3d954996d5 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit, ViewChild, Output, EventEmitter, ViewEncapsulation } from '@angular/core'; +import { DICTIONARY } from '../../../../dictionary/global.dictionary'; + +@Component({ + selector: 'dlab-ssn-monitor', + templateUrl: './ssn-monitor.component.html', + styleUrls: ['./ssn-monitor.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class SsnMonitorComponent implements OnInit { + readonly DICTIONARY = DICTIONARY; + + public errorMessage: string = ''; + public monitorData = {}; + + @ViewChild('bindDialog') bindDialog; + @Output() manageEnv: EventEmitter<{}> = new EventEmitter(); + + ngOnInit() {} + + public open(param, data): void { + this.monitorData = data || {}; + this.bindDialog.open(param); + } + public close(param, data): void { + this.bindDialog.close(); + } + + public isEmpty(obj) { + if (obj) return Object.keys(obj).length === 0; + } + + public convertSize(bytes) { + if (Number(bytes) === 0) return '0 Byte'; + + const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB']; + const i = Math.floor(Math.log(bytes) / Math.log(1024)); + return parseFloat((bytes / Math.pow(1024, i)).toFixed(3)) + ' ' + sizes[i]; + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts new file mode 100644 index 0000000000..6b8e0f40d1 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { MaterialModule } from '../../shared/material.module'; +import { FormControlsModule } from '../../shared/form-controls'; + +import { ProjectComponent } from './project.component'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + MaterialModule, + FormControlsModule, + ], + declarations: [ProjectComponent], + exports: [ProjectComponent] +}) +export class ProjectModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html new file mode 100644 index 0000000000..4d4b0d83db --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -0,0 +1,19 @@ + + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss new file mode 100644 index 0000000000..7220975503 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss @@ -0,0 +1,18 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts new file mode 100644 index 0000000000..75c222fe18 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'dlab-project', + templateUrl: './project.component.html', + styleUrls: ['./project.component.scss'] +}) +export class ProjectComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} From 0a9998c360d6edc0593b79c9a42b42deab3df5a9 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 13:03:35 +0300 Subject: [PATCH 012/357] moved compoments to administration --- .../backup-dilog/backup-dilog.component.html | 82 ----- .../backup-dilog/backup-dilog.component.scss | 26 -- .../backup-dilog/backup-dilog.component.ts | 75 ----- .../webapp/src/app/management/index.ts | 91 ------ .../manage-environment-dilog.component.html | 73 ----- .../manage-environment-dilog.component.scss | 87 ------ .../manage-environment-dilog.component.ts | 129 -------- .../group-name-validarion.directive.ts | 37 --- .../manage-roles-groups.component.html | 154 --------- .../manage-roles-groups.component.scss | 292 ------------------ .../manage-roles-groups.component.ts | 192 ------------ .../management-grid.component.html | 161 ---------- .../management-grid.component.scss | 40 --- .../management-grid.component.ts | 172 ----------- .../app/management/management.component.html | 55 ---- .../app/management/management.component.scss | 37 --- .../app/management/management.component.ts | 275 ----------------- .../src/app/management/management.model.ts | 58 ---- .../src/app/management/project/index.ts | 39 --- .../management/project/project.component.html | 3 - .../management/project/project.component.scss | 0 .../management/project/project.component.ts | 34 -- .../ssn-monitor/ssn-monitor.component.html | 117 ------- .../ssn-monitor/ssn-monitor.component.scss | 50 --- .../ssn-monitor/ssn-monitor.component.ts | 59 ---- 25 files changed, 2338 deletions(-) delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.html delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.scss delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/index.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.html delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.scss delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/group-name-validarion.directive.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.html delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.scss delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.scss delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/management.component.html delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/management.component.scss delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/management.component.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/management.model.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/project/index.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/project/project.component.html delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/project/project.component.scss delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/project/project.component.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.html delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.scss delete mode 100644 services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.html deleted file mode 100644 index 9c797ad667..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - -

Backup options

- - -
-
- - Configuration files - -
-
- - User keys - -
-
- - Database - -
-
- - SSL Certificates - -
-
- - JAR files - -
-
- - Log files - -
-
- - -
-
- - diff --git a/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.scss deleted file mode 100644 index e27a7a443a..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.scss +++ /dev/null @@ -1,26 +0,0 @@ -/*! - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -.hold-block { - padding: 5px 10px; - transition: all 0.4s ease-out; - &:hover { - color: #35afd5; - } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.ts deleted file mode 100644 index 7569a782a9..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/backup-dilog/backup-dilog.component.ts +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Component, OnInit, ViewChild, Output, EventEmitter } from '@angular/core'; -import { DICTIONARY } from '../../../dictionary/global.dictionary'; - -import { BackupOptionsModel } from '../management.model'; - -@Component({ - selector: 'dlab-backup-dilog', - templateUrl: './backup-dilog.component.html', - styleUrls: ['./backup-dilog.component.scss'] -}) -export class BackupDilogComponent implements OnInit { - readonly DICTIONARY = DICTIONARY; - public backupOptions: BackupOptionsModel = new BackupOptionsModel([], [], [], [], false, false); - public valid: boolean = true; - - @ViewChild('bindDialog') bindDialog; - @Output() backupOpts: EventEmitter<{}> = new EventEmitter(); - - ngOnInit() { - this.backupOptions.setDegault(); - this.bindDialog.onClosing = () => this.backupOptions.setDegault(); - } - - public open(param): void { - this.valid = true; - this.bindDialog.open(param); - } - - public onHoldChanged($event, key): void { - this.backupOptions[key] instanceof Array - ? (this.backupOptions[key][0] = $event.checked ? 'all' : 'skip') - : (this.backupOptions[key] = !this.backupOptions[key]); - - this.checkValidity(); - } - - public applyOptions(): void { - this.backupOpts.emit(this.backupOptions); - this.backupOptions.setDegault(); - this.bindDialog.close(); - } - - private checkValidity(): void { - const items = []; - - Object.keys(this.backupOptions).forEach(el => { - if (this.backupOptions[el] instanceof Array) { - if (this.backupOptions[el][0] && this.backupOptions[el][0] !== 'skip') items.push(this.backupOptions[el][0]); - } else { - if (this.backupOptions[el]) items.push(this.backupOptions[el]) ; - } - }); - - this.valid = items.length > 0; - } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/management/index.ts deleted file mode 100644 index ea183913a1..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/index.ts +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { - ModalModule, - UploadKeyDialogModule, - ProgressDialogModule, - BubbleModule, - ConfirmationDialogModule -} from '../shared'; -import { MaterialModule } from '../shared/material.module'; - -import { ManagementComponent } from './management.component'; -import { - ManagementGridComponent, - ConfirmationDialogComponent -} from './management-grid/management-grid.component'; -import { ComputationalResourcesModule } from '../resources/computational/computational-resources-list'; - - - - -import { FormControlsModule } from '../shared/form-controls'; -import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; -import { - ManageEnvironmentComponent, - ConfirmActionDialogComponent -} from './manage-environment/manage-environment-dilog.component'; - -import { GroupNameValidationDirective } from './manage-roles-groups/group-name-validarion.directive'; -import { DirectivesModule } from '../core/directives'; - -import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; -import { ManageRolesGroupsComponent, ConfirmDeleteUserAccountDialogComponent } from './manage-roles-groups/manage-roles-groups.component'; -import { ProjectModule } from './project'; - -export * from './management.component'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - ProjectModule, - ModalModule, - UploadKeyDialogModule, - ProgressDialogModule, - BubbleModule, - ConfirmationDialogModule, - ComputationalResourcesModule, - FormControlsModule, - DirectivesModule, - MaterialModule - ], - declarations: [ - ManagementComponent, - ManagementGridComponent, - - GroupNameValidationDirective, - BackupDilogComponent, - ManageEnvironmentComponent, - ConfirmationDialogComponent, - ConfirmActionDialogComponent, - ConfirmDeleteUserAccountDialogComponent, - SsnMonitorComponent, - ManageRolesGroupsComponent - ], - entryComponents: [ConfirmationDialogComponent, ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent], - exports: [ManagementComponent] -}) -export class ManagenementModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.html deleted file mode 100644 index 094ec9b1d6..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - -

Manage environment

- - -
-
-
- - -
User
-
Limit
-
Actions
- -
- -
{{ manageUsersForm.controls['users'].controls[i].value['name'] }}
-
- - Only positive integers are allowed - Per-user quotes cannot be greater than total budget -
-
- pause_circle_outline - - - - pause_circle_outline - - - - phonelink_off -
- -
-
- -
- - Total budget cannot be lower than a sum of users quotes -
-
-
- - -
- -
-
-
No active users environments
-
- - diff --git a/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.scss deleted file mode 100644 index b268e6f287..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.scss +++ /dev/null @@ -1,87 +0,0 @@ -/*! - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -.manage-env-dialog { - .mat-list { - .mat-list-item { - height: 60px; - position: relative; - .mat-list-item-content { - padding: 0 !important; - justify-content: space-between; - color: #577289; - } - } - } - .scrolling-content { - max-height: 300px; - min-height: 85px; - overflow-y: auto; - } - .username { - width: 45%; - } - .quotes { - width: 40%; - margin-right: 10px; - position: relative; - .danger_color { - position: absolute; - left: 0; - top: 36px; - } - } - .action { - width: 15%; - span { - padding: 3px; - cursor: pointer; - &:hover { - color: #35afd5; - } - i { - font-size: 20px; - } - } - .disabled { - cursor: not-allowed !important; - pointer-events: all; - opacity: .6; - &:hover { - color: #6b8299; - } - } - } - .total-budget { - border-top: 1px solid #edf1f5; - padding-top: 15px; - .control { - position: relative; - width: 56%; - .danger_color { - position: absolute; - left: 0; - bottom: -20px; - } - } - .label { - width: 44%; - } - } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.ts deleted file mode 100644 index 6a6d025e1c..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/manage-environment/manage-environment-dilog.component.ts +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Component, ViewChild, Output, EventEmitter, ViewEncapsulation, Inject } from '@angular/core'; -import { Validators, FormBuilder, FormGroup, FormArray } from '@angular/forms'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { DICTIONARY } from '../../../dictionary/global.dictionary'; - -@Component({ - selector: 'dlab-manage-env-dilog', - templateUrl: './manage-environment-dilog.component.html', - styleUrls: ['./manage-environment-dilog.component.scss'], - encapsulation: ViewEncapsulation.None -}) -export class ManageEnvironmentComponent { - readonly DICTIONARY = DICTIONARY; - public usersList: Array = []; - public manageUsersForm: FormGroup; - public manageTotalsForm: FormGroup; - - @ViewChild('bindDialog') bindDialog; - @Output() manageEnv: EventEmitter<{}> = new EventEmitter(); - @Output() setBudget: EventEmitter<{}> = new EventEmitter(); - - constructor( - private _fb: FormBuilder, - public dialog: MatDialog - ) { } - - get usersEnvironments(): FormArray { - return this.manageUsersForm.get('users'); - } - - public open(param, data, settings): void { - this.usersList = data; - !this.manageUsersForm && this.initForm(); - - this.manageUsersForm.setControl('users', - this._fb.array((this.usersList || []).map((x: any) => this._fb.group({ - name: x.name, budget: [x.budget, [Validators.min(0), this.userValidityCheck.bind(this)]], status: x.status - })))); - this.manageUsersForm.controls['total'].setValue(settings.conf_max_budget || null); - this.bindDialog.open(param); - } - - public setBudgetLimits(value) { - this.setBudget.emit(value); - this.bindDialog.close(); - } - - public applyAction(action, user) { - const dialogRef: MatDialogRef = this.dialog.open( - ConfirmActionDialogComponent, { data: {action, user: user.value.name}, width: '550px', panelClass: 'error-modalbox' }); - dialogRef.afterClosed().subscribe(result => { - if (result) this.manageEnv.emit({action, user: user.value.name}); - }); - } - - private initForm(): void { - this.manageUsersForm = this._fb.group({ - total: [null, [Validators.min(0), this.totalValidityCheck.bind(this)]], - users: this._fb.array([this._fb.group({ name: '', budget: null, status: ''})]) - }); - } - - private getCurrentUsersTotal(): number { - return this.manageUsersForm.value.users.reduce((memo, el) => memo += el.budget, 0); - } - - private getCurrentTotalValue(): number { - return this.manageUsersForm.value.total; - } - - private totalValidityCheck(control) { - return (control && control.value) - ? (control.value >= this.getCurrentUsersTotal() ? null : { overrun: true }) - : null; - } - - private userValidityCheck(control) { - if (control && control.value) { - return (this.getCurrentTotalValue() && this.getCurrentTotalValue() < this.getCurrentUsersTotal()) ? { overrun: true } : null; - } - } -} - -@Component({ - selector: 'dialog-result-example-dialog', - template: ` -
-

{{ data.action }} resource

- -
-
-

Environment of {{ data.user }} will be - terminated. - stopped. -

-

Do you want to proceed?

-
-
- - -
- `, - styles: [] -}) -export class ConfirmActionDialogComponent { - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any - ) { } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/group-name-validarion.directive.ts b/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/group-name-validarion.directive.ts deleted file mode 100644 index e3f720718a..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/group-name-validarion.directive.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Directive, forwardRef, Input } from '@angular/core'; -import { AbstractControl, NG_VALIDATORS, Validator } from '@angular/forms'; - -@Directive({ - selector: '[validator][ngModel],[group-dir][ngFormControl]', - providers: [{ - multi: true, - provide: NG_VALIDATORS, - useExisting: forwardRef(() => GroupNameValidationDirective) - }] -}) -export class GroupNameValidationDirective implements Validator { - @Input() validator: Function; - - validate(control: AbstractControl): { [key: string]: any; } { - return this.validator(control); - } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.html b/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.html deleted file mode 100644 index 85b751b493..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - -

Manage roles

- - -
- - - - Groups -
- -
Group name can only contain letters, numbers, hyphens and '_'
-
Group name already exists
-
-
- - -
- - - Roles -
-
- - - - - - playlist_add_check All - - - clear None - - - - {{ role }} - - - - -
-
-
- - - -
- - - Users -
- -
-
- - - -
- - - -
- - - - - - - - - - - - - -
NameRolesUsersAction
{{ item.group }} -
- - - - - playlist_add_check All - - - clear None - - - - {{ role }} - - - - -
- 		- - - - -
- - - {{ user }} - clear - - -
- 		- - - -
-
-
- - - diff --git a/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.scss deleted file mode 100644 index b28c061c3d..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.scss +++ /dev/null @@ -1,292 +0,0 @@ -/*! - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -::ng-deep .mat-option:first-child .mat-pseudo-checkbox { display: none; } - -.caret { - width: 40px; - color: #4ab8dc; - border: none; - border-left: 1px solid #ececec; - background-color: #fff; - position: absolute; - right: 0; - top: 0px; - height: 36px; - cursor: pointer; - &.not-allowed { - background-color: #dcdcdc; - } -} - - -.content-box { - padding: 20px 30px 35px; - height: 85vh; - overflow-y: auto; -} -.no-details { - color: #d8d8d8; -} -.mat-divider { - margin: 10px 0; -} -.stepper { - height: 190px; - margin-top: 10px; - .inner-step { - height: 70px; - padding: 5px; - display: flex; - justify-content: center; - flex-direction: column; - text-align: center; - input { - width: 490px; - align-self: center; - } - .caret { - i { - margin-top: 3px; - } - } - } - .text-center { - button { - &:not(:last-child) { - margin-right: 5px; - } - } - } -} -.selector-wrapper { - display: flex; - align-self: center; - width: 490px; - height: 36px; - padding-left: 10px; - font-family: 'Open Sans', sans-serif; - font-size: 15px; - font-weight: 300; - box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); - mat-form-field { - width: 100%; - .mat-form-field-wrapper { - padding-bottom: 0; - } - .mat-icon { - font-size: 20px; - } - } - .dropdown-multiselect { - width: 100% !important; - > button { - padding: 6px 22px; - } - } -} -.list-header { - padding: 0 15px; -} -.scrolling-content { - max-height: 450px; - overflow-x: hidden; - overflow-y: auto; - display: block; - padding: 15px 5px; - &.stepper-opened { - height: 250px; - } -} -.roles { - width: 30%; - padding: 0 10px; - .selector-wrapper-edit { - position: relative; - display: flex; - justify-content: space-between; - height: 36px; - padding-left: 10px; - background: #fff; - box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); - multi-select-dropdown { - width: 100%; - .dropdown-multiselect { - > button { - padding: 8px 22px 5px; - } - } - } - .caret { - &:hover { - box-shadow: 0 3px 1px -10px rgba(0, 0, 0, 0.2), 0 2px 1px 0 rgba(0, 0, 0, 0.17), 0 1px 5px 0 rgba(0, 0, 0, 0.12) - } - } - } -} -.groups { - width: 20%; -} -.users { - width: 30%; - padding: 0 10px; -} -.users-list { - padding: 5px 10px; - font-family: 'Open Sans', sans-serif; - font-size: 15px; - font-weight: 300; - color: #577289; - position: relative; - i { - color: #FF5722; - font-size: 18px; - cursor: pointer; - } - .list-selected { - width: 100%; - margin-top: 50px; - height: inherit; - min-height: 0; - overflow-y: hidden; - } -} -.expanded-panel { - display: flex; - align-items: flex-end; - .add-input-block { - display: flex; - height: 36px; - padding-right: 0; - outline: none; - box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); - input { - height: 36px; - padding: 0; - padding-left: 10px; - width: 170px; - } - .caret { - width: 50px; - } - } -} - - -mat-expansion-panel-header { - &.mat-expansion-panel-header { - font-family: 'Open Sans', sans-serif; - font-size: 15px; - font-weight: 300; - color: #577289; - } -} - -.mat-step-header { - .mat-step-icon { - background-color: #36afd5 !important; - } - .mat-step-label { - font-family: 'Open Sans', sans-serif; - font-size: 16px; - font-weight: 300; - } -} - -.dashboard_table { - .dashboard_table_body { - .actions { - padding: 10px 0; - } - &.filter-row { - .actions { - button { - background: none; - .mid { - vertical-align: sub; - } - } - } - } - } - .th_actions { - width: 10%; - } -} - -.mat-chip:not(.mat-basic-chip) { - transition: box-shadow 280ms cubic-bezier(.4,0,.2,1); - padding: 7px 0 7px 10px; - border-radius: 24px; - cursor: default; - display: inline-block; - position: relative; - padding-right: 25px; - white-space: nowrap; - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; - margin: 2px !important; -} -mat-chip.mat-chip a { - position: absolute; - right: 15px; -} -mat-form-field.chip-list { - &.mat-form-field { - position: absolute; - top: 2px; - width: 94%; - font-size: 16px; - font-weight: 300; - } -} - -.mat-raised-button { - &.butt { - &.butt-success { - margin-left: 0; - } - } -} -.multiple-select { - border-bottom: 1px solid #dedbdb; - padding: 0; - a { - display: inline-block; - width: 50%; - padding: 0 15px; - vertical-align: middle; - color: #575757; - cursor: pointer; - i { - vertical-align: sub; - font-size: 20px; - } - &:hover { - color: #4eaf3e; - background: #f9fafb; - } - &.deselect { - &:hover { - color: #f1696e; - } - } - } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.ts deleted file mode 100644 index 932e42b9a1..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/manage-roles-groups/manage-roles-groups.component.ts +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Component, OnInit, ViewChild, Output, EventEmitter, Inject } from '@angular/core'; -import { ValidatorFn, FormControl, NgModel } from '@angular/forms'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { DICTIONARY } from '../../../dictionary/global.dictionary'; - -@Component({ - selector: 'dlab-manage-roles-groups', - templateUrl: './manage-roles-groups.component.html', - styleUrls: ['../../resources/resources-grid/resources-grid.component.css', './manage-roles-groups.component.scss'] -}) -export class ManageRolesGroupsComponent implements OnInit { - readonly DICTIONARY = DICTIONARY; - - public groupsData: Array = []; - public roles: Array = []; - public rolesList: Array = []; - public setupGroup: string = ''; - public setupUser: string = ''; - public manageUser: string = ''; - public setupRoles: Array = []; - public updatedRoles: Array = []; - public delimitersRegex = /[-_]?/g; - public groupnamePattern = new RegExp(/^[a-zA-Z0-9_\-]+$/); - - @ViewChild('bindDialog') bindDialog; - @Output() manageRolesGroupAction: EventEmitter<{}> = new EventEmitter(); - stepperView: boolean = false; - - constructor(public dialog: MatDialog) { } - - ngOnInit() { - this.bindDialog.onClosing = () => this.resetDialog(); - } - - public open(param, groups, roles): void { - this.roles = roles; - this.rolesList = roles.map(role => role.description); - this.updateGroupData(groups); - - this.stepperView = false; - this.bindDialog.open(param); - } - - public onUpdate($event) { - if ($event.type === 'role') { - this.setupRoles = $event.model; - } else { - this.updatedRoles = $event.model; - } - $event.$event.preventDefault(); - } - - public selectAllOptions(item, values, byKey?) { - byKey ? (item[byKey] = values ? values : []) : this.setupRoles = values ? values : []; - } - - public manageAction(action: string, type: string, item?: any, value?) { - if (action === 'create') { - this.manageRolesGroupAction.emit( - { action, type, value: { - name: this.setupGroup, - users: this.setupUser ? this.setupUser.split(',').map(elem => elem.trim()) : [], - roleIds: this.extractIds(this.roles, this.setupRoles) - } - }); - this.stepperView = false; - } else if (action === 'delete') { - const data = (type === 'users') ? {group: item.group, user: value} : {group: item.group, id: item}; - const dialogRef: MatDialogRef = this.dialog.open( - ConfirmDeleteUserAccountDialogComponent, - { data: data, width: '550px', panelClass: 'error-modalbox' } - ); - - dialogRef.afterClosed().subscribe(result => { - if (result) { - const emitValue = (type === 'users') - ? {action, type, id: item.name, value: { user: value, group: item.group }} - : {action, type, id: item.name, value: item.group} ; - this.manageRolesGroupAction.emit(emitValue); - } - }); - } else if (action === 'update') { - this.manageRolesGroupAction.emit({action, type, value: { - name: item.group, - roleIds: this.extractIds(this.roles, item.selected_roles), - users: item.users || [] }}); - } - this.resetDialog(); - } - - public extractIds(sourceList, target) { - return sourceList.reduce((acc, item) => { - target.includes(item.description) && acc.push(item._id); - return acc; - }, []); - } - - public updateGroupData(groups) { - this.groupsData = groups; - - this.groupsData.forEach(item => { - item.selected_roles = item.roles.map(role => role.description); - }); - } - - public groupValidarion(): ValidatorFn { - - const duplicateList: any = this.groupsData.map(item => item.group); - return ((control: FormControl) => { - if (control.value && duplicateList.includes(this.delimitersFiltering(control.value))) - return { duplicate: true }; - - if (control.value && !this.groupnamePattern.test(control.value)) - return { patterns: true }; - - return null; - }); - } - - public compareObjects(o1: any, o2: any): boolean { - return o1.toLowerCase() === o2.toLowerCase(); - } - - public delimitersFiltering(resource): string { - return resource.replace(this.delimitersRegex, '').toString().toLowerCase(); - } - - public resetDialog() { - this.stepperView = false; - this.setupGroup = ''; - this.setupUser = ''; - this.manageUser = ''; - this.setupRoles = []; - this.updatedRoles = []; - } - - public removeUser(list, item): void { - list.splice(list.indexOf(item), 1); - } - - public addUser(value: string, item): void { - if (value && value.trim()) { - item.users instanceof Array ? item.users.push(value.trim()) : item.users = [value.trim()]; - } - } -} - - -@Component({ - selector: 'dialog-result-example-dialog', - template: ` -
-

priority_highWarning

- -
-
-

User {{ data.user }} will be deleted from {{ data.group }} group.

-

Group {{ data.group }} will be decommissioned.

-

Do you want to proceed?

-
-
- - -
- `, - styles: [] -}) -export class ConfirmDeleteUserAccountDialogComponent { - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any - ) { } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html deleted file mode 100644 index 6b8bb95c0e..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -
UserNameStatusShape / Resource idComputational resourcesAction
{{ env.user }}{{ env.name }}{{env.status}}{{ env.shape || env.ip }} -
-
- no details -
- -
- 		- - -
    -
  • -
    - pause_circle_outline - Stop -
    -
    • -
  • -
    - phonelink_off - Terminate -
    -
    • - -
    -
  • - play_circle_outline - Start -
    • -
  • - refresh - Recreate -
    • -
  • - sync_problem - Reupload key -
    • -
    -
- -
- - - - - - - - - - - - - - - -
TypeResource idStatusAction
{{env.type}}{{env.resource_id}}{{env.status}} - - - - -
    -
  • - pause_circle_outline - Stop -
    • -
  • - play_circle_outline - Start -
    • -
  • - refresh - Recreate -
    • -
  • - sync_problem - Reupload key -
    • -
- -
- - - - - \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.scss deleted file mode 100644 index 6198578416..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.scss +++ /dev/null @@ -1,40 +0,0 @@ -/*! - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -.dashboard_table { - .th_user, - .th_name { - width: 20%; - } - .th_shape, - .th_status { - width: 12% !important; - } - .th_resources { - width: 33%; - } - .dashboard_table_body { - td:first-child { - cursor: default; - } - } -} -.source .resource-wrap .resource-name .detailed-link { - cursor: default !important; -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.ts deleted file mode 100644 index b5297b2606..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.ts +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Component, OnInit, ViewChild, Input, Output, EventEmitter, Inject } from '@angular/core'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { ToastrService } from 'ngx-toastr'; - -import { HealthStatusService, UserAccessKeyService } from '../../core/services'; -import { ConfirmationDialogType } from '../../shared'; -import { FileUtils } from '../../core/util'; - -export interface ManageAction { - action: string; - environment: string; - resource: string; -} - -@Component({ - selector: 'management-grid', - templateUrl: 'management-grid.component.html', - styleUrls: [ - './management-grid.component.scss', - '../../resources/resources-grid/resources-grid.component.css', - '../../resources/computational/computational-resources-list/computational-resources-list.component.scss' - ] -}) -export class ManagementGridComponent implements OnInit { - @Input() allEnvironmentData: Array; - @Input() environmentsHealthStatuses: Array; - @Input() healthStatus: string; - @Input() resources: Array; - @Input() uploadKey: boolean; - @Input() isAdmin: boolean; - @Input() currentUser: string = ''; - @Output() refreshGrid: EventEmitter<{}> = new EventEmitter(); - @Output() actionToggle: EventEmitter = new EventEmitter(); - - @ViewChild('confirmationDialog') confirmationDialog; - @ViewChild('keyReuploadDialog') keyReuploadDialog; - - constructor( - private healthStatusService: HealthStatusService, - private userAccessKeyService: UserAccessKeyService, - public toastr: ToastrService, - public dialog: MatDialog - ) {} - - ngOnInit() { - } - - buildGrid(): void { - this.refreshGrid.emit(); - } - - toggleResourceAction(environment, action: string, resource?) { - if (resource) { - const resource_name = resource ? resource.computational_name : environment.name; - const dialogRef: MatDialogRef = this.dialog.open(ConfirmationDialogComponent, { - data: { action, resource_name, user: environment.user }, - width: '550px', - panelClass: 'error-modalbox' - }); - dialogRef.afterClosed().subscribe(result => { - result && this.actionToggle.emit({ action, environment, resource }); - }); - } else { - if (action === 'stop') { - this.confirmationDialog.open( - { isFooter: false }, - environment, - (environment.name === 'edge node' || environment.type.toLowerCase() === 'edge node') - ? ConfirmationDialogType.StopEdgeNode - : ConfirmationDialogType.StopExploratory, - ); - } else if (action === 'terminate') { - this.confirmationDialog.open({ isFooter: false }, environment, ConfirmationDialogType.TerminateExploratory); - } else if (action === 'run') { - this.healthStatusService - .runEdgeNode() - .subscribe(() => { - this.buildGrid(); - this.toastr.success('Edge node is starting!', 'Processing!'); - }, error => this.toastr.error('Edge Node running failed!', 'Oops!')); - } else if (action === 'recreate') { - this.healthStatusService - .recreateEdgeNode() - .subscribe(() => { - this.buildGrid(); - this.toastr.success('Edge Node recreation is processing!', 'Processing!'); - }, error => this.toastr.error('Edge Node recreation failed!', 'Oops!')); - } - } - } - - isResourcesInProgress(notebook) { - if (notebook) { - if (notebook.name === 'edge node') { - return this.allEnvironmentData - .filter(env => env.user === notebook.user) - .some(el => this.inProgress([el]) || this.inProgress(el.resources)); - } else if (notebook.resources.length) { - return this.inProgress(notebook.resources); - } - } - return false; - } - - inProgress(resources) { - return resources.filter(resource => ( - resource.status !== 'failed' - && resource.status !== 'terminated' - && resource.status !== 'running' - && resource.status !== 'stopped')).length > 0; - } - - showReuploaKeydDialog() { - this.keyReuploadDialog.open({ isFooter: false }); - } - - public generateUserKey() { - this.userAccessKeyService.regenerateAccessKey().subscribe(data => { - FileUtils.downloadFile(data); - this.buildGrid(); - }); - } -} - - -@Component({ - selector: 'confirm-dialog', - template: ` -
-

{{ data.action }} resource

- -
-
-

Resource {{ data.resource_name }} of user {{ data.user }} will be - decommissioned. - stopped. -

-

Do you want to proceed?

-
-
- - -
- `, - styles: [ - ] -}) -export class ConfirmationDialogComponent { - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any - ) {} -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/management/management.component.html deleted file mode 100644 index b0b2788cb0..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/management.component.html +++ /dev/null @@ -1,55 +0,0 @@ - - -
-
- - - - -
- -
- - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/management.component.scss deleted file mode 100644 index ee18db9f73..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/management.component.scss +++ /dev/null @@ -1,37 +0,0 @@ -/*! - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -.sub-nav { - justify-content: flex-end; - .admin-group { - margin-right: 10px; - } - button { - margin-right: 10px; - &:last-child { - margin-right: 0; - } - &.env { - width: 210px; - } - &.ssn { - width: inherit; - } - } -} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts deleted file mode 100644 index b55d5dabf6..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; -import { ToastrService } from 'ngx-toastr'; -import { Subscription } from 'rxjs'; - -import { - HealthStatusService, - ManageEnvironmentsService, - UserAccessKeyService, - BackupService, - UserResourceService, - RolesGroupsService, - StorageService -} from '../core/services'; - -import { EnvironmentModel, GeneralEnvironmentStatus } from './management.model'; -import { HTTP_STATUS_CODES } from '../core/util'; - -@Component({ - selector: 'environments-management', - templateUrl: './management.component.html', - styleUrls: ['./management.component.scss'] -}) -export class ManagementComponent implements OnInit, OnDestroy { - public user: string = ''; - public healthStatus: GeneralEnvironmentStatus; - public allEnvironmentData: Array; - public uploadKey: boolean = true; - public anyEnvInProgress: boolean = false; - public notebookInProgress: boolean = false; - - private subscriptions: Subscription = new Subscription(); - private clear = undefined; - - @ViewChild('backupDialog') backupDialog; - @ViewChild('manageEnvDialog') manageEnvironmentDialog; - @ViewChild('keyUploadModal') keyUploadDialog; - @ViewChild('preloaderModal') preloaderDialog; - @ViewChild('ssnMonitor') ssnMonitorDialog; - @ViewChild('rolesGroupsModal') rolesGroupsDialog; - - constructor( - private healthStatusService: HealthStatusService, - private backupService: BackupService, - private manageEnvironmentsService: ManageEnvironmentsService, - private userAccessKeyService: UserAccessKeyService, - private userResourceService: UserResourceService, - private rolesService: RolesGroupsService, - private storageService: StorageService, - public toastr: ToastrService - ) {} - - ngOnInit() { - this.buildGrid(); - this.user = this.storageService.getUserName(); - this.subscriptions.add(this.userAccessKeyService.accessKeyEmitter - .subscribe(result => this.uploadKey = (result && result.status === 200))); - - this.subscriptions.add(this.userAccessKeyService.keyUploadProccessEmitter.subscribe(response => { - if (response) this.buildGrid(); - })); - } - - ngOnDestroy(): void { - this.subscriptions.unsubscribe(); - } - - public buildGrid() { - this.getEnvironmentHealthStatus(); - } - - public manageEnvironmentAction($event) { - this.manageEnvironmentsService - .environmentManagement( - $event.environment.user, - $event.action, - $event.environment.name === 'edge node' ? 'edge' : $event.environment.name, - $event.resource ? $event.resource.computational_name : null - ).subscribe( - () => this.buildGrid(), - error => this.toastr.error('Environment management failed!', 'Oops!')); - } - - showBackupDialog() { - if (!this.backupDialog.isOpened) this.backupDialog.open({ isFooter: false }); - } - - getActiveUsersList() { - return this.healthStatusService.getActiveUsers(); - } - - getTotalBudgetData() { - return this.healthStatusService.getTotalBudgetData(); - } - - openManageEnvironmentDialog() { - this.getActiveUsersList().subscribe(usersList => { - this.getTotalBudgetData().subscribe(total => this.manageEnvironmentDialog.open({ isFooter: false }, usersList, total)); - }, - () => this.toastr.error('Failed users list loading!', 'Oops!')); - } - - openSsnMonitorDialog() { - this.healthStatusService.getSsnMonitorData() - .subscribe(data => this.ssnMonitorDialog.open({ isFooter: false }, data), - () => this.toastr.error('Failed ssn data loading!', 'Oops!')); - } - - openManageRolesDialog() { - this.rolesService.getGroupsData().subscribe(group => { - this.rolesService.getRolesData().subscribe( - roles => this.rolesGroupsDialog.open({ isFooter: false }, group, roles), - error => this.toastr.error(error.message, 'Oops!')); - }, - error => this.toastr.error(error.message, 'Oops!')); - } - - isEnvironmentsInProgress(data): boolean { - return data.exploratory.some(el => { - return el.status === 'creating' || el.status === 'starting' || - el.computational_resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring'); - }); - } - - isNotebookInProgress(data): boolean { - return data.exploratory.some(el => el.status === 'creating'); - } - - createBackup($event) { - this.backupService.createBackup($event).subscribe(result => { - this.getBackupStatus(result); - this.toastr.success('Backup configuration is processing!', 'Processing!'); - this.clear = window.setInterval(() => this.getBackupStatus(result), 3000); - }, - error => this.toastr.error(error.message, 'Oops!')); - } - - manageRolesGroups($event) { - switch ($event.action) { - case 'create': - this.rolesService.setupNewGroup($event.value).subscribe(res => { - this.toastr.success('Group creation success!', 'Created!'); - this.getGroupsData(); - }, () => this.toastr.error('Group creation failed!', 'Oops!')); - break; - case 'update': - this.rolesService.updateGroup($event.value).subscribe(res => { - this.toastr.success('Group data successfully updated!', 'Success!'); - this.getGroupsData(); - }, () => this.toastr.error('Failed group data updating!', 'Oops!')); - break; - case 'delete': - if ($event.type === 'users') { - this.rolesService.removeUsersForGroup($event.value).subscribe(res => { - this.toastr.success('Users was successfully deleted!', 'Success!'); - this.getGroupsData(); - }, () => this.toastr.error('Failed users deleting!', 'Oops!')); - } else if ($event.type === 'group') { - console.log('delete group'); - this.rolesService.removeGroupById($event.value).subscribe(res => { - this.toastr.success('Group was successfully deleted!', 'Success!'); - this.getGroupsData(); - }, () => this.toastr.error('Failed group deleting!', 'Oops!')); - } - break; - default: - } - } - - setBudgetLimits($event) { - this.healthStatusService.updateUsersBudget($event.users).subscribe((result: any) => { - this.healthStatusService.updateTotalBudgetData($event.total).subscribe((res: any) => { - result.status === HTTP_STATUS_CODES.OK - && res.status === HTTP_STATUS_CODES.NO_CONTENT - && this.toastr.success('Budget limits updated!', 'Success!'); - this.buildGrid(); - }); - }, error => this.toastr.error(error.message, 'Oops!')); - } - - getGroupsData() { - this.rolesService.getGroupsData().subscribe( - list => this.rolesGroupsDialog.updateGroupData(list), - error => this.toastr.error(error.message, 'Oops!')); - } - - manageEnvironment(event: {action: string, user: string}) { - this.healthStatusService - .manageEnvironment(event.action, event.user) - .subscribe(res => { - this.getActiveUsersList().subscribe(usersList => { - this.manageEnvironmentDialog.usersList = usersList; - this.toastr.success(`Action ${ event.action } is processing!`, 'Processing!'); - this.buildGrid(); - }); - }, - error => this.toastr.error(error.message, 'Oops!')); - } - - private getExploratoryList() { - this.userResourceService.getUserProvisionedResources() - .subscribe((result) => { - this.anyEnvInProgress = this.isEnvironmentsInProgress(result); - this.notebookInProgress = this.isNotebookInProgress(result); - }); - } - - private getBackupStatus(result) { - const uuid = result.body; - this.backupService.getBackupStatus(uuid) - .subscribe((backupStatus: any) => { - if (!this.creatingBackup) { - backupStatus.status === 'FAILED' - ? this.toastr.error('Backup configuration failed!', 'Oops!') - : this.toastr.success('Backup configuration completed!', 'Success!'); - clearInterval(this.clear); - } - }, () => { - clearInterval(this.clear); - this.toastr.error('Backup configuration failed!', 'Oops!'); - }); - } - - get creatingBackup(): boolean { - return this.backupService.inProgress; - } - - private getAllEnvironmentData() { - this.manageEnvironmentsService - .getAllEnvironmentData() - .subscribe((result: Array) => this.allEnvironmentData = this.loadEnvironmentList(result)); - } - - private loadEnvironmentList(data): Array { - if (data) - return data.map(value => new EnvironmentModel( - value.resource_name || value.resource_type, - value.status, - value.shape, - value.computational_resources, - value.user, - value.public_ip, - value.resource_type - )); - } - - private getEnvironmentHealthStatus() { - this.healthStatusService - .getEnvironmentStatuses() - .subscribe((status: GeneralEnvironmentStatus) => { - this.healthStatus = status; - this.healthStatus.admin && this.getAllEnvironmentData(); - this.userAccessKeyService.initialUserAccessKeyCheck(); - this.getExploratoryList(); - }); - } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts deleted file mode 100644 index 51ab7212da..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export class EnvironmentModel { - constructor( - public name: string, - public status: string, - public shape: string, - public resources: Array, - public user: string, - public ip: string, - public type?: string - ) { } -} - -export class BackupOptionsModel { - constructor( - public configFiles: Array, - public keys: Array, - public certificates: Array, - public jars: Array, - public databaseBackup: boolean, - public logsBackup: boolean - ) { } - - setDegault(): void { - this.configFiles = ['all']; - this.keys = ['all']; - this.certificates = ['skip']; - this.jars = ['skip']; - this.databaseBackup = true; - this.logsBackup = false; - } -} - -export interface GeneralEnvironmentStatus { - admin: boolean; - billingEnabled: boolean; - billingQuoteUsed: number; - list_resources: any; - status: string; -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/management/project/index.ts deleted file mode 100644 index 6b8e0f40d1..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/project/index.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MaterialModule } from '../../shared/material.module'; -import { FormControlsModule } from '../../shared/form-controls'; - -import { ProjectComponent } from './project.component'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - MaterialModule, - FormControlsModule, - ], - declarations: [ProjectComponent], - exports: [ProjectComponent] -}) -export class ProjectModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.html deleted file mode 100644 index d1e1821e66..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.html +++ /dev/null @@ -1,3 +0,0 @@ -

- project works! -

diff --git a/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.ts deleted file mode 100644 index 75c222fe18..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/project/project.component.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'dlab-project', - templateUrl: './project.component.html', - styleUrls: ['./project.component.scss'] -}) -export class ProjectComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.html b/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.html deleted file mode 100644 index 3d132661dc..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - -

SSN Monitor

- - -
-
- - -
- -
Name
-
{{ monitorData.processorInfo.name }}
- - -
Vendor
-
{{ monitorData.processorInfo.vendor }}
- - -
Logical Core Count
-
{{ monitorData.processorInfo.logicalCoreCount }}
- - -
Physical Core Count
-
{{ monitorData.processorInfo.physicalCoreCount }}
- - -
Current System Load
-
{{ monitorData.processorInfo.currentSystemLoad /100 | percent:'1.0-2' }}
- - -
System Load Average
-
{{ monitorData.processorInfo.systemLoadAverage /100 | percent:'1.0-2' }}
- - -
CPU 64 Bit
-
{{ monitorData.processorInfo.cpu64Bit }}
- -
- - - -
- -
Available Memory
-
{{ convertSize(monitorData.memoryInfo.availableMemory) }}
- - -
Total Memory
-
{{ convertSize(monitorData.memoryInfo.totalMemory) }}
- - -
Swap Total
-
{{ convertSize(monitorData.memoryInfo.swapTotal) }}
- - -
Swap Used
-
{{ convertSize(monitorData.memoryInfo.swapUsed) }}
- - -
Pages Page In
-
{{ convertSize(monitorData.memoryInfo.pagesPageIn) }}
- - -
Pages Page Out
-
{{ convertSize(monitorData.memoryInfo.pagesPageOut) }}
- -
- - - -
-
- -
Disk {{i +1}}
- - -
Used Space
-
{{ convertSize(disk.usedByteSpace) }}
- - -
Total Space
-
{{ convertSize(disk.totalByteSpace) }}
- -
-
- - -
- -
-
-
- No ssn monitor data available -
-
- - diff --git a/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.scss b/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.scss deleted file mode 100644 index 769fefeeef..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.scss +++ /dev/null @@ -1,50 +0,0 @@ -/*! - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -.ssn-monitor-dialog { - .content-box { - padding-top: 10px !important; - } - .ssn-info { - min-height: 400px; - max-height: 500px; - .scrolling-content { - max-height: 310px; - overflow-y: auto; - } - .text-center { - position: absolute; - bottom: 20px; - left: 0; - right: 0; - } - } - .mat-list-item-content { - display: flex; - justify-content: initial; - color: #577289; - padding: 15px 5px; - border-bottom: 1px solid #f3f2f2; - font-size: 15px; - .col { - width: 50%; - font-weight: 300; - } - } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.ts deleted file mode 100644 index 25b2fa3f10..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/management/ssn-monitor/ssn-monitor.component.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Component, OnInit, ViewChild, Output, EventEmitter, ViewEncapsulation } from '@angular/core'; -import { DICTIONARY } from './../../../dictionary/global.dictionary'; - -@Component({ - selector: 'dlab-ssn-monitor', - templateUrl: './ssn-monitor.component.html', - styleUrls: ['./ssn-monitor.component.scss'], - encapsulation: ViewEncapsulation.None -}) -export class SsnMonitorComponent implements OnInit { - readonly DICTIONARY = DICTIONARY; - - public errorMessage: string = ''; - public monitorData = {}; - - @ViewChild('bindDialog') bindDialog; - @Output() manageEnv: EventEmitter<{}> = new EventEmitter(); - - ngOnInit() {} - - public open(param, data): void { - this.monitorData = data || {}; - this.bindDialog.open(param); - } - public close(param, data): void { - this.bindDialog.close(); - } - - public isEmpty(obj) { - if (obj) return Object.keys(obj).length === 0; - } - - public convertSize(bytes) { - if (Number(bytes) === 0) return '0 Byte'; - - const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB']; - const i = Math.floor(Math.log(bytes) / Math.log(1024)); - return parseFloat((bytes / Math.pow(1024, i)).toFixed(3)) + ' ' + sizes[i]; - } -} From e9393569e5963032c42b2e8aec394bcf6e258ba3 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 13:06:35 +0300 Subject: [PATCH 013/357] updated paths --- .../webapp/src/app/core/services/healthStatus.service.ts | 2 +- .../exploratory-environment-create.model.ts | 2 +- .../resources/resources-grid/resources-grid.component.ts | 6 +++--- .../webapp/src/app/shared/navbar/navbar.component.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts index 4908bc59fc..68795b294f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts @@ -21,7 +21,7 @@ import { Injectable } from '@angular/core'; import { Observable, BehaviorSubject } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; -import { GeneralEnvironmentStatus } from '../../management/management.model'; +import { GeneralEnvironmentStatus } from '../../administration/management/management.model'; import { ApplicationServiceFacade } from './applicationServiceFacade.service'; import { AppRoutingService } from './appRouting.service'; import { HTTP_STATUS_CODES, ErrorUtils } from '../util'; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts index 39430b517e..55bd0c4751 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts @@ -70,7 +70,7 @@ export class ExploratoryEnvironmentCreateModel { environment_shape, fnProcessResults, fnProcessErrors); - this.loadTemplates(); + // this.loadTemplates(); } public setSelectedItem(item: ExploratoryEnvironmentVersionModel): void { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 96b0047cd6..3e660180b1 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -26,7 +26,7 @@ import { UserResourceService } from '../../core/services'; import { CreateResourceModel } from './create-resource.model'; import { ResourcesGridRowModel } from './resources-grid.model'; import { FilterConfigurationModel } from './filter-configuration.model'; -import { GeneralEnvironmentStatus } from '../../management/management.model'; +import { GeneralEnvironmentStatus } from '../../administration/management/management.model'; import { ConfirmationDialogType } from '../../shared'; import { SortUtil } from '../../core/util'; import { DetailDialogComponent } from '../exploratory/detail-dialog'; @@ -74,9 +74,9 @@ export class ResourcesGridComponent implements OnInit { ]; constructor( + public toastr: ToastrService, private userResourceService: UserResourceService, - private dialog: MatDialog, - public toastr: ToastrService + private dialog: MatDialog ) {} ngOnInit(): void { diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index 603af493b0..c5b2e7176c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -29,7 +29,7 @@ import { ApplicationSecurityService, UserAccessKeyService, SchedulerService, StorageService} from '../../core/services'; -import { GeneralEnvironmentStatus } from '../../management/management.model'; +import { GeneralEnvironmentStatus } from '../../administration/management/management.model'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; import { HTTP_STATUS_CODES, FileUtils } from '../../core/util'; import { NotificationDialogComponent } from '../modal-dialog/notification-dialog'; From b200edcaf6fcf0ea0f60ae4986f7931967b97574 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 13:07:01 +0300 Subject: [PATCH 014/357] updated paths --- .../main/resources/webapp/src/app/app.module.ts | 17 ++++++++--------- .../webapp/src/app/app.routing.module.ts | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/app.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.module.ts index 01ca32f6b4..0caf8ebd84 100644 --- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts @@ -24,6 +24,11 @@ import { BrowserModule } from '@angular/platform-browser'; import { LocationStrategy, HashLocationStrategy } from '@angular/common'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { ToastrModule } from 'ngx-toastr'; + +import { HttpTokenInterceptor } from './core/interceptors/http.token.interceptor'; +import { NoCacheInterceptor } from './core/interceptors/nocache.interceptor'; +import { ErrorInterceptor } from './core/interceptors/error.interceptor'; import { AppComponent } from './app.component'; import { AppRoutingModule } from './app.routing.module'; @@ -35,15 +40,11 @@ import { GuidesModule } from './help'; import { NotFoundModule } from './not-found/not-found.module'; import { AccessDeniedModule } from './access-denied/access-denied.module'; import { ResourcesModule } from './resources/resources.module'; -import { HttpTokenInterceptor } from './core/interceptors/http.token.interceptor'; -import { NoCacheInterceptor } from './core/interceptors/nocache.interceptor'; -import { ErrorInterceptor } from './core/interceptors/error.interceptor'; import { ReportingModule } from './reporting/reporting.module'; -import { ManagenementModule } from './management'; +import { AdministrationModule } from './administration/administration.module'; import { WebterminalModule } from './webterminal'; import { CoreModule } from './core/core.module'; -import { ToastrModule } from 'ngx-toastr'; @NgModule({ declarations: [AppComponent], @@ -60,14 +61,12 @@ import { ToastrModule } from 'ngx-toastr'; NotFoundModule, AccessDeniedModule, ReportingModule, - ManagenementModule, + AdministrationModule, WebterminalModule, RouterModule, AppRoutingModule, CoreModule.forRoot(), - ToastrModule.forRoot({ - timeOut: 10000 - }) + ToastrModule.forRoot({ timeOut: 10000 }) ], providers: [{ provide: LocationStrategy, diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts index 6bb7e9a884..dae0bd9445 100644 --- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts @@ -28,8 +28,8 @@ import { NotFoundComponent } from './not-found/not-found.component'; import { AccessDeniedComponent } from './access-denied/access-denied.component'; import { ReportingComponent } from './reporting/reporting.component'; import { WebterminalComponent } from './webterminal/webterminal.component'; -import { ManagementComponent } from './management/management.component'; -import { ProjectComponent } from './management/project/project.component'; +import { ManagementComponent } from './administration/management/management.component'; +import { ProjectComponent } from './administration/project/project.component'; import { AuthorizationGuard, CheckParamsGuard, CloudProviderGuard } from './core/services'; From 7dd2beea5003c47e419f8c319f018cabe9b099e9 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 13:31:06 +0300 Subject: [PATCH 015/357] added material controllers into ami component --- .../ami-create-dialog.component.html | 14 +++++----- .../ami-create-dialog.component.ts | 28 +++++++------------ .../exploratory/ami-create-dialog/index.ts | 1 + .../exploratory/detail-dialog/index.ts | 2 -- .../index.ts | 2 -- .../resources-grid.component.html | 2 +- .../resources-grid.component.ts | 6 ++-- 7 files changed, 23 insertions(+), 32 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html index 24b979f27f..2fe3ecf526 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html @@ -17,11 +17,11 @@ ~ under the License. --> - - +
+
- - +
+
@@ -43,9 +43,9 @@
- +
- - +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.ts index 1011f74841..14abbb3b62 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.ts @@ -17,8 +17,9 @@ * under the License. */ -import { Component, OnInit, ViewChild, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, Inject } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import { UserResourceService } from '../../../core/services'; @@ -39,41 +40,32 @@ export class AmiCreateDialogComponent implements OnInit { delimitersRegex = /[-_]?/g; imagesList: any; - @ViewChild('bindDialog') bindDialog; - @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); - constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public toastr: ToastrService, + public dialogRef: MatDialogRef, private _userResource: UserResourceService, private _fb: FormBuilder, - public toastr: ToastrService - ) {} + ) { } ngOnInit() { this._userResource.getImagesList().subscribe(res => this.imagesList = res); + this.open(this.data); } - public open(param, notebook): void { + public open(notebook): void { this.notebook = notebook; this.initFormModel(); this._userResource.getImagesList().subscribe(res => this.imagesList = res); - this.bindDialog.open(param); - } - - public resetForm() { - this.initFormModel(); - this.bindDialog.close(); } public assignChanges(data) { this._userResource.createAMI(data).subscribe( response => { - if (response.status === HTTP_STATUS_CODES.ACCEPTED) { - this.bindDialog.close(); - this.buildGrid.emit(); - } + if (response.status === HTTP_STATUS_CODES.ACCEPTED) this.dialogRef.close(); }, - error => this.toastr.error(error.message || `${ DICTIONARY.image.toLocaleUpperCase() } creation failed!`, 'Oops!')); + error => this.toastr.error(error.message || `${DICTIONARY.image.toLocaleUpperCase()} creation failed!`, 'Oops!')); } private initFormModel(): void { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts index 1d3bfc7103..93b8f503ab 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts @@ -35,6 +35,7 @@ export * from './ami-create-dialog.component'; ReactiveFormsModule ], declarations: [AmiCreateDialogComponent], + entryComponents: [AmiCreateDialogComponent], exports: [AmiCreateDialogComponent] }) export class AmiCreateDialogModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts index 93d5332657..f46a7e5f67 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts @@ -20,7 +20,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { ModalModule } from '../../../shared'; import { MaterialModule } from '../../../shared/material.module'; import { DetailDialogComponent } from './detail-dialog.component'; import { DirectivesModule } from '../../../core/directives'; @@ -30,7 +29,6 @@ export * from './detail-dialog.component'; @NgModule({ imports: [ CommonModule, - ModalModule, FormsModule, ReactiveFormsModule, MaterialModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts index 8160fae077..9380a13450 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts @@ -22,14 +22,12 @@ import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../../shared/material.module'; -import { ModalModule } from '../../../shared'; import { FormControlsModule } from '../../../shared/form-controls'; import { ExploratoryEnvironmentCreateComponent } from './exploratory-environment-create-dialog.component'; @NgModule({ imports: [ CommonModule, - ModalModule, FormsModule, ReactiveFormsModule, FormControlsModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 8585046582..dbd469c745 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -160,4 +160,4 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 3e660180b1..93b7d4c046 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -30,6 +30,7 @@ import { GeneralEnvironmentStatus } from '../../administration/management/manage import { ConfirmationDialogType } from '../../shared'; import { SortUtil } from '../../core/util'; import { DetailDialogComponent } from '../exploratory/detail-dialog'; +import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @@ -61,7 +62,7 @@ export class ResourcesGridComponent implements OnInit { @ViewChild('costDetailsDialog') costDetailsDialog; @ViewChild('installLibs') installLibraries; @ViewChild('envScheduler') scheduler; - @ViewChild('createAmi') createAMI; + // @ViewChild('createAmi') createAMI; public filteringColumns: Array = [ @@ -307,7 +308,8 @@ export class ResourcesGridComponent implements OnInit { } else if (action === 'schedule') { this.scheduler.open({ isFooter: false }, data, 'EXPLORATORY'); } else if (action === 'ami') { - this.createAMI.open({ isFooter: false }, data); + this.dialog.open(AmiCreateDialogComponent, { data: data }) + .afterClosed().subscribe(() => this.buildGrid()); } } } From dd6348b898f5c2719254f47a18091c775c6725c9 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 13:58:34 +0300 Subject: [PATCH 016/357] added material controllers into library insrtallation component --- .../detail-dialog/detail-dialog.component.ts | 1 - .../exploratory/install-libraries/index.ts | 3 +- .../install-libraries.component.html | 12 ++-- .../install-libraries.component.ts | 70 +++++++++---------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts index 836c265893..897aba4d30 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts @@ -26,7 +26,6 @@ import { DateUtils, CheckUtils } from '../../../core/util'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import { DataengineConfigurationService } from '../../../core/services'; import { CLUSTER_CONFIGURATION } from '../../computational/computational-resource-create-dialog/cluster-configuration-templates'; -import { DebugRenderer2 } from '@angular/core/src/view/services'; @Component({ selector: 'detail-dialog', diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts index 18e0ec924f..427cd97a18 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts @@ -27,6 +27,7 @@ import { FormControlsModule } from '../../../shared/form-controls'; import { KeysPipeModule, LibSortPipeModule, HighLightPipeModule } from '../../../core/pipes'; import { InstallLibrariesComponent, ErrorMessageDialogComponent } from './install-libraries.component'; +export * from './install-libraries.component'; @NgModule({ imports: [ @@ -42,7 +43,7 @@ import { InstallLibrariesComponent, ErrorMessageDialogComponent } from './instal BubbleModule ], declarations: [InstallLibrariesComponent, ErrorMessageDialogComponent], - entryComponents: [ErrorMessageDialogComponent], + entryComponents: [InstallLibrariesComponent, ErrorMessageDialogComponent], exports: [InstallLibrariesComponent] }) export class InstallLibrariesModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html index f2d6c893a9..9065bbfca6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html @@ -17,12 +17,12 @@ ~ under the License. --> - - +
+
- - +
+

Cannot install libraries: Exploratory @@ -155,5 +155,5 @@

- - +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts index a5cb02f2c8..f09ac02223 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts @@ -36,8 +36,6 @@ import { LibrariesInstallationService} from '../../../core/services'; import { SortUtil, HTTP_STATUS_CODES } from '../../../core/util'; - - @Component({ selector: 'install-libraries', templateUrl: './install-libraries.component.html', @@ -77,17 +75,19 @@ export class InstallLibrariesComponent implements OnInit { private clear: number; private clearCheckInstalling = undefined; - @ViewChild('bindDialog') bindDialog; + // @ViewChild('bindDialog') bindDialog; @ViewChild('groupSelect') group_select; @ViewChild('resourceSelect') resource_select; - @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); + // @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); constructor( + @Inject(MAT_DIALOG_DATA) public data: any, public dialog: MatDialog, + public toastr: ToastrService, + public dialogRef: MatDialogRef, private librariesInstallationService: LibrariesInstallationService, - private changeDetector: ChangeDetectorRef, - public toastr: ToastrService + private changeDetector: ChangeDetectorRef ) { this.model = InstallLibrariesModel.getDefault(librariesInstallationService); } @@ -100,10 +100,11 @@ export class InstallLibrariesComponent implements OnInit { this.query = newValue || ''; this.filterList(); }); - this.bindDialog.onClosing = () => { - this.resetDialog(); - this.buildGrid.emit(); - }; + // this.bindDialog.onClosing = () => { + // this.resetDialog(); + // this.buildGrid.emit(); + // }; + this.open(this.data); } uploadLibGroups(): void { @@ -196,34 +197,33 @@ export class InstallLibrariesComponent implements OnInit { this.model.selectedLibs.splice(this.model.selectedLibs.indexOf(item), 1); } - public open(param, notebook): void { - if (!this.bindDialog.isOpened) - this.notebook = notebook; - this.model = new InstallLibrariesModel(notebook, - response => { - if (response.status === HTTP_STATUS_CODES.OK) { - this.getInstalledLibrariesList(); - this.resetDialog(); - } - }, - error => this.toastr.error(error.message || 'Library installation failed!', 'Oops!'), - () => { - this.bindDialog.open(param); - - this.getInstalledLibrariesList(true); - this.changeDetector.detectChanges(); - this.selectorsReset(); - }, - this.librariesInstallationService); + public open(notebook): void { + this.notebook = notebook; + this.model = new InstallLibrariesModel(notebook, + response => { + if (response.status === HTTP_STATUS_CODES.OK) { + this.getInstalledLibrariesList(); + this.resetDialog(); + } + }, + error => this.toastr.error(error.message || 'Library installation failed!', 'Oops!'), + () => { + // this.bindDialog.open(param); + + this.getInstalledLibrariesList(true); + this.changeDetector.detectChanges(); + this.selectorsReset(); + }, + this.librariesInstallationService); } - public close(): void { - if (this.bindDialog.isOpened) - this.bindDialog.close(); + // public close(): void { + // if (this.bindDialog.isOpened) + // this.bindDialog.close(); - this.buildGrid.emit(); - this.resetDialog(); - } + // this.buildGrid.emit(); + // this.resetDialog(); + // } public showErrorMessage(item): void { const dialogRef: MatDialogRef = this.dialog.open( From ccc6cc8dd1b8c17408750a8ffb192771d8fb9e73 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 14:42:37 +0300 Subject: [PATCH 017/357] added material controllers into ungit component --- .../manage-ungit/manage-ungit.component.html | 12 +++---- .../manage-ungit/manage-ungit.component.ts | 33 ++++++++----------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html index c1d1e2c133..a8a46dd3a5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html @@ -17,11 +17,11 @@ ~ under the License. --> - - +
+
- - +
+
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts index 2bceb72ff5..46acefe8a4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts @@ -44,41 +44,34 @@ export class ManageUngitComponent implements OnInit { public editableForm: boolean = false; public updateAccountCredentialsForm: FormGroup; - @ViewChild('bindDialog') bindDialog; @ViewChild('tabGroup') tabGroup; constructor( + public toastr: ToastrService, + public dialog: MatDialog, + public dialogRef: MatDialogRef, private manageUngitService: ManageUngitService, private _fb: FormBuilder, - public dialog: MatDialog, - public toastr: ToastrService ) { this.model = MangeUngitModel.getDefault(manageUngitService); } ngOnInit() { - this.bindDialog.onClosing = () => this.cancelAllModifyings(); + // this.bindDialog.onClosing = () => this.cancelAllModifyings(); + this.open(); this.initFormModel(); this.getGitCredentials(); } - public open(param): void { - if (!this.bindDialog.isOpened) - this.model = new MangeUngitModel(response => { }, - error => this.toastr.error(error.message || 'Manage git credentials failed!', 'Oops!'), - () => { - this.bindDialog.open(param); - - if (!this.gitCredentials.length) - this.tabGroup.selectedIndex = 1; - }, - this.manageUngitService); - } - - public close(): void { - if (this.bindDialog.isOpened) - this.bindDialog.close(); + public open(): void { + this.model = new MangeUngitModel(response => { }, + error => this.toastr.error(error.message || 'Manage git credentials failed!', 'Oops!'), + () => { + if (!this.gitCredentials.length) + this.tabGroup.selectedIndex = 1; + }, + this.manageUngitService); } public resetForm(): void { From e8a775078fa6a8fcdb04b5cf3c01464ce9f9a523 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 14:44:03 +0300 Subject: [PATCH 018/357] fixed dialog close with dialogRef control --- ...y-environment-create-dialog.component.html | 2 +- ...ory-environment-create-dialog.component.ts | 12 +----------- .../exploratory-environment-create.model.ts | 2 +- .../install-libraries.component.html | 2 +- .../install-libraries.component.ts | 19 +------------------ 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html index 5383d2ab47..20625dcda3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html @@ -84,7 +84,7 @@
- +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts index 89252ca633..c0f7e5fe8d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts @@ -144,19 +144,14 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { } public open(params?): void { - this.model.loadTemplates(); this.model = new ExploratoryEnvironmentCreateModel('', '', '', '', '', response => { - if (response.status === HTTP_STATUS_CODES.OK) { - this.dialogRef.close(); - // this.buildGrid.emit(); - } + if (response.status === HTTP_STATUS_CODES.OK) this.dialogRef.close(); }, error => this.toastr.error(error.message || 'Exploratory creation failed!', 'Oops!'), () => this.templateDescription = this.model.selectedItem.description, () => { this.initFormModel(); - // this.bindDialog.open(params); this.setDefaultParams(); this.getImagesList(); }, @@ -184,11 +179,6 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { } } - // public close(): void { - // if (this.bindDialog.isOpened) - // this.bindDialog.close(); - // } - private resetDialog(): void { this.initFormModel(); this.model.resetModel(); diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts index 55bd0c4751..39430b517e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts @@ -70,7 +70,7 @@ export class ExploratoryEnvironmentCreateModel { environment_shape, fnProcessResults, fnProcessErrors); - // this.loadTemplates(); + this.loadTemplates(); } public setSelectedItem(item: ExploratoryEnvironmentVersionModel): void { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html index 9065bbfca6..e752cae063 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html @@ -151,7 +151,7 @@
- +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts index f09ac02223..8075eee97c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts @@ -75,16 +75,13 @@ export class InstallLibrariesComponent implements OnInit { private clear: number; private clearCheckInstalling = undefined; - // @ViewChild('bindDialog') bindDialog; @ViewChild('groupSelect') group_select; @ViewChild('resourceSelect') resource_select; - // @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); - constructor( @Inject(MAT_DIALOG_DATA) public data: any, - public dialog: MatDialog, public toastr: ToastrService, + public dialog: MatDialog, public dialogRef: MatDialogRef, private librariesInstallationService: LibrariesInstallationService, private changeDetector: ChangeDetectorRef @@ -100,10 +97,6 @@ export class InstallLibrariesComponent implements OnInit { this.query = newValue || ''; this.filterList(); }); - // this.bindDialog.onClosing = () => { - // this.resetDialog(); - // this.buildGrid.emit(); - // }; this.open(this.data); } @@ -208,8 +201,6 @@ export class InstallLibrariesComponent implements OnInit { }, error => this.toastr.error(error.message || 'Library installation failed!', 'Oops!'), () => { - // this.bindDialog.open(param); - this.getInstalledLibrariesList(true); this.changeDetector.detectChanges(); this.selectorsReset(); @@ -217,14 +208,6 @@ export class InstallLibrariesComponent implements OnInit { this.librariesInstallationService); } - // public close(): void { - // if (this.bindDialog.isOpened) - // this.bindDialog.close(); - - // this.buildGrid.emit(); - // this.resetDialog(); - // } - public showErrorMessage(item): void { const dialogRef: MatDialogRef = this.dialog.open( ErrorMessageDialogComponent, { data: item.error, width: '550px', panelClass: 'error-modalbox' }); From 73b81d0fd415c4c426444f58cced639459529202 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 14:45:44 +0300 Subject: [PATCH 019/357] fixed management controls of calling components on resources --- .../resources-grid/resources-grid.component.html | 2 +- .../resources-grid/resources-grid.component.ts | 7 +++---- .../webapp/src/app/resources/resources.component.html | 2 +- .../webapp/src/app/resources/resources.component.ts | 11 +++++++---- .../webapp/src/app/resources/resources.module.ts | 2 +- .../src/app/shared/navbar/navbar.component.html | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index dbd469c745..ddce580ef2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -158,6 +158,6 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 93b7d4c046..58c5766821 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -31,6 +31,7 @@ import { ConfirmationDialogType } from '../../shared'; import { SortUtil } from '../../core/util'; import { DetailDialogComponent } from '../exploratory/detail-dialog'; import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog'; +import { InstallLibrariesComponent } from '../exploratory/install-libraries'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @@ -60,10 +61,7 @@ export class ResourcesGridComponent implements OnInit { @ViewChild('confirmationDialog') confirmationDialog; @ViewChild('detailDialog') detailDialog; @ViewChild('costDetailsDialog') costDetailsDialog; - @ViewChild('installLibs') installLibraries; @ViewChild('envScheduler') scheduler; - // @ViewChild('createAmi') createAMI; - public filteringColumns: Array = [ { title: 'Environment name', name: 'name', className: 'th_name', filtering: {} }, @@ -304,7 +302,8 @@ export class ResourcesGridComponent implements OnInit { } else if (action === 'terminate') { this.confirmationDialog.open({ isFooter: false }, data, ConfirmationDialogType.TerminateExploratory); } else if (action === 'install') { - this.installLibraries.open({ isFooter: false }, data); + this.dialog.open(InstallLibrariesComponent, { data: data }) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'schedule') { this.scheduler.open({ isFooter: false }, data, 'EXPLORATORY'); } else if (action === 'ami') { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index ba9bfd1fce..dbaea8338a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -49,4 +49,4 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts index 9260cd9335..e0c71a0c5c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts @@ -24,8 +24,9 @@ import { MatDialog } from '@angular/material'; import { ResourcesGridComponent } from './resources-grid/resources-grid.component'; import { ExploratoryEnvironmentCreateComponent } from './exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component'; -import { UserAccessKeyService, HealthStatusService } from '../core/services'; import { ResourcesGridRowModel } from './resources-grid/resources-grid.model'; +import { UserAccessKeyService, HealthStatusService } from '../core/services'; +import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; import { HTTP_STATUS_CODES, FileUtils } from '../core/util'; @Component({ @@ -41,7 +42,7 @@ export class ResourcesComponent implements OnInit, OnDestroy { public healthStatus: any; @ViewChild('createAnalyticalModal') createAnalyticalModal; - @ViewChild('manageUngitDialog') manageUngitDialog; + // @ViewChild('manageUngitDialog') manageUngitDialog; @ViewChild(ResourcesGridComponent) resourcesGrid: ResourcesGridComponent; subscriptions: Subscription = new Subscription(); @@ -97,8 +98,10 @@ export class ResourcesComponent implements OnInit, OnDestroy { } public manageUngit(): void { - if (!this.manageUngitDialog.isOpened) - this.manageUngitDialog.open({ isFooter: false }); + // if (!this.manageUngitDialog.isOpened) + // this.manageUngitDialog.open({ isFooter: false }); + this.dialog.open(ManageUngitComponent) + .afterClosed().subscribe(() => this.refreshGrid()); } private getEnvironmentHealthStatus() { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts index 6c28e27cc3..2e0bbce94c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts @@ -50,7 +50,7 @@ import { ManageUngitComponent, ConfirmDeleteAccountDialog ], - entryComponents: [ConfirmDeleteAccountDialog], + entryComponents: [ManageUngitComponent, ConfirmDeleteAccountDialog], exports: [ResourcesComponent] }) export class ResourcesModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 8558fdc9aa..eb341c59bc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -88,7 +88,7 @@ Emvironment Management + [routerLinkActiveOptions]="{exact:true}">Environment Management Date: Mon, 20 May 2019 16:27:17 +0300 Subject: [PATCH 020/357] added material controllers into cluster creation component --- ...onal-resource-create-dialog.component.html | 14 ++--- ...tional-resource-create-dialog.component.ts | 63 +++++++++---------- .../index.ts | 1 + 3 files changed, 38 insertions(+), 40 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index dcf1c2518f..704de73e20 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -17,11 +17,11 @@ ~ under the License. --> - - +
+

Add computational resources

- - +
+
Add computational resources
- +
@@ -162,5 +162,5 @@

Add computational resources

Computational resource creations are not available.
Please, check your permissions.
- - +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts index 6acc6843ac..f6b133447b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts @@ -17,8 +17,9 @@ * under the License. */ -import { Component, OnInit, EventEmitter, Output, ViewChild, ChangeDetectorRef } from '@angular/core'; +import { Component, OnInit, EventEmitter, Output, ViewChild, ChangeDetectorRef, Inject } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import { ComputationalResourceCreateModel } from './computational-resource-create.model'; @@ -59,7 +60,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { public maxSpotPrice: number = 0; public resourceForm: FormGroup; - @ViewChild('bindDialog') bindDialog; + // @ViewChild('bindDialog') bindDialog; @ViewChild('name') name; @ViewChild('clusterType') cluster_type; @ViewChild('templatesList') templates_list; @@ -72,17 +73,20 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public toastr: ToastrService, private userResourceService: UserResourceService, private _fb: FormBuilder, private ref: ChangeDetectorRef, - public toastr: ToastrService + public dialogRef: MatDialogRef, ) { this.model = ComputationalResourceCreateModel.getDefault(userResourceService); } ngOnInit() { this.initFormModel(); - this.bindDialog.onClosing = () => this.resetDialog(); + // this.bindDialog.onClosing = () => this.resetDialog(); + this.open(this.data.notebook, this.data.full_list); } // public isNumberKey($event): boolean { @@ -207,30 +211,28 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { return false; } - public open(params, notebook_instance, full_list): void { - if (!this.bindDialog.isOpened) { - this.notebook_instance = notebook_instance; - this.full_list = full_list; - this.model = new ComputationalResourceCreateModel('', 0, '', '', notebook_instance.name, - response => { - if (response.status === HTTP_STATUS_CODES.OK) { - this.close(); - this.buildGrid.emit(); - } - }, - error => this.toastr.error(error.message || 'Computational resource creation failed!', 'Oops!'), - () => this.template_description = this.model.selectedItem.description, - () => { - this.bindDialog.open(params); - this.bindDialog.modalClass += !this.model.availableTemplates ? 'reset' : ''; - - this.ref.detectChanges(); - - this.setDefaultParams(); - this.getComputationalResourceLimits(); - }, - this.userResourceService); - } + public open(notebook_instance, full_list): void { + this.notebook_instance = notebook_instance; + this.full_list = full_list; + this.model = new ComputationalResourceCreateModel('', 0, '', '', notebook_instance.name, + response => { + if (response.status === HTTP_STATUS_CODES.OK) { + this.dialogRef.close(); + this.buildGrid.emit(); + } + }, + error => this.toastr.error(error.message || 'Computational resource creation failed!', 'Oops!'), + () => this.template_description = this.model.selectedItem.description, + () => { + // this.bindDialog.modalClass += !this.model.availableTemplates ? 'reset' : ''; + // this.dialogRef.updateSize('40%', '80%'); + + this.ref.detectChanges(); + + this.setDefaultParams(); + this.getComputationalResourceLimits(); + }, + this.userResourceService); } public preemptibleCounter($event, action): void { @@ -241,11 +243,6 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { this.resourceForm.controls.preemptible_instance_number.setValue(newValue); } - public close(): void { - if (this.bindDialog.isOpened) - this.bindDialog.close(); - } - private initFormModel(): void { this.resourceForm = this._fb.group({ cluster_alias_name: ['', [Validators.required, Validators.pattern(this.clusterNamePattern), diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts index 3fe3ce70c7..6098623260 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts @@ -36,6 +36,7 @@ import { ComputationalResourceCreateDialogComponent } from './computational-reso MaterialModule ], declarations: [ComputationalResourceCreateDialogComponent], + entryComponents: [ComputationalResourceCreateDialogComponent], exports: [ComputationalResourceCreateDialogComponent] }) export class ComputationalResourceCreateDialogModule {} From 4c8aa3a12815f227aa7f29bf6f1dbb2b48b71eee Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 16:30:17 +0300 Subject: [PATCH 021/357] added material controllers into cluster details component --- .../cluster-details.component.html | 12 +++++----- .../cluster-details.component.ts | 24 +++++++++---------- .../computational/cluster-details/index.ts | 1 + 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html index ec62674e1c..7420257b01 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html @@ -17,9 +17,9 @@ ~ under the License. --> - - - +
+
+
@@ -99,7 +99,7 @@
- + @@ -111,5 +111,5 @@

{{resource.error_message}}

- - + + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts index 2bcf5afb3e..186c519705 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts @@ -17,12 +17,12 @@ * under the License. */ -import { Component, ViewChild, OnInit, Output, EventEmitter } from '@angular/core'; -import { DateUtils } from '../../../core/util'; +import { Component, ViewChild, OnInit, Inject } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { FormGroup, FormBuilder } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; -import { CheckUtils } from '../../../core/util'; +import { DateUtils, CheckUtils } from '../../../core/util'; import { DataengineConfigurationService } from '../../../core/services'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import { CLUSTER_CONFIGURATION } from '../computational-resource-create-dialog/cluster-configuration-templates'; @@ -38,7 +38,6 @@ export class DetailComputationalResourcesComponent implements OnInit { resource: any; environment: any; - @ViewChild('bindDialog') bindDialog; @ViewChild('configurationNode') configuration; upTimeInHours: number; @@ -47,19 +46,20 @@ export class DetailComputationalResourcesComponent implements OnInit { config: Array<{}> = []; public configurationForm: FormGroup; - @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); - constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public toastr: ToastrService, + public dialogRef: MatDialogRef, private dataengineConfigurationService: DataengineConfigurationService, - private _fb: FormBuilder, - public toastr: ToastrService + private _fb: FormBuilder ) {} ngOnInit() { - this.bindDialog.onClosing = () => this.resetDialog(); + // this.bindDialog.onClosing = () => this.resetDialog(); + this.open(this.data.environment, this.data.resource) } - public open(param, environment, resource): void { + public open(environment, resource): void { this.tooltip = false; this.resource = resource; this.environment = environment; @@ -69,7 +69,6 @@ export class DetailComputationalResourcesComponent implements OnInit { this.initFormModel(); if (this.resource.image === 'docker.dlab-dataengine') this.getClusterConfiguration(); - this.bindDialog.open(param); } public isEllipsisActive($event): void { @@ -98,8 +97,7 @@ export class DetailComputationalResourcesComponent implements OnInit { this.dataengineConfigurationService .editClusterConfiguration(data.configuration_parameters, this.environment.name, this.resource.computational_name) .subscribe(result => { - this.bindDialog.close(); - this.buildGrid.emit(); + this.dialogRef.close(); }, error => this.toastr.error(error.message || 'Edit onfiguration failed!', 'Oops!')); } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts index b81e2e7220..25e12a3123 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts @@ -30,6 +30,7 @@ export * from './cluster-details.component'; @NgModule({ imports: [CommonModule, ModalModule, FormsModule, ReactiveFormsModule, MaterialModule], declarations: [DetailComputationalResourcesComponent], + entryComponents: [DetailComputationalResourcesComponent], exports: [DetailComputationalResourcesComponent], }) From 4943d9ebe6893780dc644c9b9b61b6ecc3b34549 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 16:31:27 +0300 Subject: [PATCH 022/357] connect added controllers --- .../computational-resources-list.component.html | 2 +- .../computational-resources-list.component.ts | 11 +++++++---- .../resources-grid/resources-grid.component.html | 2 +- .../resources-grid/resources-grid.component.ts | 8 ++++++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html index 3881705e44..a495e618e9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html @@ -56,5 +56,5 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts index a6d08db05c..55650eebe7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts @@ -18,10 +18,11 @@ */ import { Component, EventEmitter, Input, Output, ViewChild, Inject } from '@angular/core'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import { UserResourceService } from '../../../core/services'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { DetailComputationalResourcesComponent } from '../cluster-details'; @Component({ selector: 'computational-resources-list', @@ -41,9 +42,9 @@ export class ComputationalResourcesListComponent { @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); constructor( - private userResourceService: UserResourceService, public dialog: MatDialog, - public toastr: ToastrService + public toastr: ToastrService, + private userResourceService: UserResourceService ) { } toggleResourceAction(resource, action: string) { @@ -79,7 +80,9 @@ export class ComputationalResourcesListComponent { } detailComputationalResources(environment, resource): void { - this.detailComputationalResource.open({ isFooter: false }, environment, resource); + // this.detailComputationalResource.open({ isFooter: false }, environment, resource); + this.dialog.open(DetailComputationalResourcesComponent, { data: { environment, resource }}) + .afterClosed().subscribe(() => this.rebuildGrid()); }; openScheduleDialog(resource) { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index ddce580ef2..8958fe9334 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -155,7 +155,7 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 58c5766821..7e06ea5bd3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -32,6 +32,7 @@ import { SortUtil } from '../../core/util'; import { DetailDialogComponent } from '../exploratory/detail-dialog'; import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog'; import { InstallLibrariesComponent } from '../exploratory/install-libraries'; +import { ComputationalResourceCreateDialogComponent } from '../computational/computational-resource-create-dialog/computational-resource-create-dialog.component'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @@ -57,7 +58,7 @@ export class ResourcesGridComponent implements OnInit { healthStatus: GeneralEnvironmentStatus; delimitersRegex = /[-_]?/g; - @ViewChild('computationalResourceModal') computationalResourceModal; + // @ViewChild('computationalResourceModal') computationalResourceModal; @ViewChild('confirmationDialog') confirmationDialog; @ViewChild('detailDialog') detailDialog; @ViewChild('costDetailsDialog') costDetailsDialog; @@ -290,7 +291,10 @@ export class ResourcesGridComponent implements OnInit { exploratoryAction(data, action: string) { if (action === 'deploy') { this.notebookName = data.name; - this.computationalResourceModal.open({ isFooter: false }, data, this.environments); + // this.computationalResourceModal.open({ isFooter: false }, data, this.environments); + + this.dialog.open(ComputationalResourceCreateDialogComponent, { data: { notebook: data, full_list: this.environments}}) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'run') { this.userResourceService .runExploratoryEnvironment({ notebook_instance_name: data.name }) From ac2074ff992ad255d971dd158911569d920e53be Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 17:33:35 +0300 Subject: [PATCH 023/357] added material controllers into const details dialog --- .../cost-details-dialog.component.html | 10 +++---- .../cost-details-dialog.component.ts | 26 +++++++++---------- .../billing/cost-details-dialog/index.ts | 1 + 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html index 8a370d8832..cf904f06be 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html @@ -17,9 +17,9 @@ ~ under the License. --> - - - +
+
+
@@ -58,5 +58,5 @@ Total: {{ notebook.cost }} {{ notebook.currency_code }} - - + + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.ts index 30733bad31..39bb7703f3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.ts @@ -17,27 +17,25 @@ * under the License. */ -import { Component, ViewChild } from '@angular/core'; +import { Component, OnInit, Inject } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; @Component({ - selector: 'cost-details-dialog', - templateUrl: 'cost-details-dialog.component.html', - styleUrls: ['cost-details-dialog.component.scss'] + selector: 'cost-details-dialog', + templateUrl: 'cost-details-dialog.component.html', + styleUrls: ['cost-details-dialog.component.scss'] }) -export class CostDetailsDialogComponent { +export class CostDetailsDialogComponent implements OnInit { readonly DICTIONARY = DICTIONARY; public notebook: any; - @ViewChild('bindDialog') bindDialog; + constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef + ) { } - public open(params, notebook): void { - this.notebook = notebook; - this.bindDialog.open(params); - } - - public close(): void { - if (this.bindDialog.isOpened) - this.bindDialog.close(); + ngOnInit() { + this.notebook = this.data; } } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts index 859295e7c2..11a0424276 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts @@ -29,6 +29,7 @@ export * from './cost-details-dialog.component'; @NgModule({ imports: [CommonModule, ModalModule, MaterialModule], declarations: [CostDetailsDialogComponent], + entryComponents: [CostDetailsDialogComponent], exports: [CostDetailsDialogComponent] }) export class CostDetailsDialogModule {} From 381793a0a68b2916ba8d0b17a894bc6a1020bdc7 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 17:34:17 +0300 Subject: [PATCH 024/357] added material controllers into scheduler --- ...omputational-resources-list.component.html | 2 +- .../computational-resources-list.component.ts | 5 ++- .../detail-dialog/detail-dialog.component.ts | 2 +- .../resources-grid.component.html | 4 +- .../resources-grid.component.ts | 12 +++-- .../src/app/resources/scheduler/index.ts | 1 + .../scheduler/scheduler.component.html | 14 +++--- .../scheduler/scheduler.component.ts | 45 ++++++++++--------- 8 files changed, 49 insertions(+), 36 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html index a495e618e9..75f19fb9e0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html @@ -57,4 +57,4 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts index 55650eebe7..713b5ceaf8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts @@ -23,6 +23,7 @@ import { ToastrService } from 'ngx-toastr'; import { UserResourceService } from '../../../core/services'; import { DetailComputationalResourcesComponent } from '../cluster-details'; +import { SchedulerComponent } from '../../scheduler'; @Component({ selector: 'computational-resources-list', @@ -86,7 +87,9 @@ export class ComputationalResourcesListComponent { }; openScheduleDialog(resource) { - this.clusterScheduler.open({ isFooter: false }, this.environment, 'СOMPUTATIONAL', resource); + // this.clusterScheduler.open({ isFooter: false }, this.environment, 'СOMPUTATIONAL', resource); + this.dialog.open(SchedulerComponent, { data: {notebook: this.environment, type: 'СOMPUTATIONAL', resource} }) + .afterClosed().subscribe(() => this.rebuildGrid()); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts index 897aba4d30..8f75eeae37 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Component, ViewChild, OnInit, Output, EventEmitter, Inject } from '@angular/core'; +import { Component, ViewChild, OnInit, Inject } from '@angular/core'; import { FormGroup, FormBuilder } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 8958fe9334..2297b6c3bc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -157,7 +157,7 @@ - + - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 7e06ea5bd3..1ef10e60d7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -33,6 +33,8 @@ import { DetailDialogComponent } from '../exploratory/detail-dialog'; import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog'; import { InstallLibrariesComponent } from '../exploratory/install-libraries'; import { ComputationalResourceCreateDialogComponent } from '../computational/computational-resource-create-dialog/computational-resource-create-dialog.component'; +import { CostDetailsDialogComponent } from '../billing/cost-details-dialog'; +import { SchedulerComponent } from '../scheduler'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @@ -62,7 +64,7 @@ export class ResourcesGridComponent implements OnInit { @ViewChild('confirmationDialog') confirmationDialog; @ViewChild('detailDialog') detailDialog; @ViewChild('costDetailsDialog') costDetailsDialog; - @ViewChild('envScheduler') scheduler; + // @ViewChild('envScheduler') scheduler; public filteringColumns: Array = [ { title: 'Environment name', name: 'name', className: 'th_name', filtering: {} }, @@ -285,7 +287,9 @@ export class ResourcesGridComponent implements OnInit { } printCostDetails(data): void { - this.costDetailsDialog.open({ isFooter: false }, data); + // this.costDetailsDialog.open({ isFooter: false }, data); + this.dialog.open(CostDetailsDialogComponent, { data: data }) + .afterClosed().subscribe(() => this.buildGrid()); } exploratoryAction(data, action: string) { @@ -309,7 +313,9 @@ export class ResourcesGridComponent implements OnInit { this.dialog.open(InstallLibrariesComponent, { data: data }) .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'schedule') { - this.scheduler.open({ isFooter: false }, data, 'EXPLORATORY'); + // this.scheduler.open({ isFooter: false }, data, 'EXPLORATORY'); + this.dialog.open(SchedulerComponent, { data: {notebook: data, type: 'EXPLORATORY'} }) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'ami') { this.dialog.open(AmiCreateDialogComponent, { data: data }) .afterClosed().subscribe(() => this.buildGrid()); diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts index f407368ec6..b2d76838da 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts @@ -42,6 +42,7 @@ export * from './scheduler.model'; TimePickerModule ], declarations: [SchedulerComponent], + entryComponents: [SchedulerComponent], exports: [SchedulerComponent] }) export class SchedulerModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html index 83d55d6ba4..8d6ad16388 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html @@ -17,16 +17,16 @@ ~ under the License. --> - - +
+

Scheduler for {{ destination.name }} {{ destination.computational_name }}

- - +
+
@@ -203,10 +203,10 @@

Scheduler
- +

- - \ No newline at end of file +
+
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts index 3582b113ea..1837e41ba2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts @@ -17,8 +17,9 @@ * under the License. */ -import { Component, OnInit, ViewChild, Output, EventEmitter, ViewEncapsulation, ChangeDetectorRef } from '@angular/core'; +import { Component, OnInit, ViewChild, Output, EventEmitter, ViewEncapsulation, ChangeDetectorRef, Inject } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import * as _moment from 'moment'; @@ -67,37 +68,39 @@ export class SchedulerComponent implements OnInit { public inactivityLimits = { min: 120, max: 10080 }; public integerRegex: string = '^[0-9]*$'; - @ViewChild('bindDialog') bindDialog; + // @ViewChild('bindDialog') bindDialog; @ViewChild('resourceSelect') resource_select; - @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); + // @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public toastr: ToastrService, + public dialogRef: MatDialogRef, private formBuilder: FormBuilder, private schedulerService: SchedulerService, - private changeDetector: ChangeDetectorRef, - public toastr: ToastrService + private changeDetector: ChangeDetectorRef ) {} ngOnInit() { - this.bindDialog.onClosing = () => { - this.resetDialog(); - this.buildGrid.emit(); - }; + // this.bindDialog.onClosing = () => { + // this.resetDialog(); + // this.buildGrid.emit(); + // }; + this.open(this.data.notebook, this.data.type, this.data.resource); } - public open(param, notebook, type, resource?): void { + public open(notebook, type, resource?): void { this.notebook = notebook; this.zones = _moment.tz.names() .map(el => _moment.tz(el).format('Z')) .filter((item, pos, ar) => ar.indexOf(item) === pos) .sort(); - if (!this.bindDialog.isOpened) this.model = new SchedulerModel( response => { if (response.status === HTTP_STATUS_CODES.OK) { this.toastr.success('Schedule data were successfully saved', 'Success!'); - this.close(); + this.dialogRef.close(); } }, error => this.toastr.error(error.message || 'Scheduler configuration failed!', 'Oops!'), @@ -118,7 +121,7 @@ export class SchedulerComponent implements OnInit { this.allowInheritView = this.checkIsActiveSpark(); this.getExploratorySchedule(this.notebook.name); } - this.bindDialog.open(param); + // this.bindDialog.open(param); }, this.schedulerService ); @@ -179,7 +182,7 @@ export class SchedulerComponent implements OnInit { this.model.setInactivityTime(params).subscribe((response: any) => { if (response.status === HTTP_STATUS_CODES.OK) { this.toastr.success('Schedule data were successfully saved', 'Success!'); - this.close(); + this.dialogRef.close(); } }, error => this.toastr.error(error.message || 'Scheduler configuration failed!', 'Oops!')); @@ -206,7 +209,7 @@ export class SchedulerComponent implements OnInit { .subscribe(() => { this.resetDialog(); this.toastr.success('Schedule data were successfully deleted', 'Success!'); - this.close(); + this.dialogRef.close(); }); } @@ -259,13 +262,13 @@ export class SchedulerComponent implements OnInit { : this.setInactivity(this.notebook.name, {...data, consider_inactivity: this.considerInactivity}); } - public close(): void { - if (this.bindDialog.isOpened) { - this.bindDialog.close(); - } + // public close(): void { + // if (this.bindDialog.isOpened) { + // this.bindDialog.close(); + // } - this.resetDialog(); - } + // this.resetDialog(); + // } private formInit(start?: string, end?: string, terminate?: string) { this.schedulerForm = this.formBuilder.group({ From 16497263d08aeb8c4fb7bcca451f81d3ee6afcb1 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 17:35:16 +0300 Subject: [PATCH 025/357] added basic theme into default config --- services/self-service/src/main/resources/webapp/angular.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/angular.json b/services/self-service/src/main/resources/webapp/angular.json index 1863e34914..6e27247649 100644 --- a/services/self-service/src/main/resources/webapp/angular.json +++ b/services/self-service/src/main/resources/webapp/angular.json @@ -23,7 +23,7 @@ ], "styles": [ { - "input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css" + "input": "node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css" }, "src/styles.scss", "node_modules/ngx-toastr/toastr.css" @@ -79,7 +79,7 @@ ], "styles": [ { - "input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css" + "input": "node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css" }, "src/styles.scss", "src/assets/fonts/iconfont/material-icons.css" From 1311fc23d178b7a8a2121eb1cf0497f982990e68 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 20 May 2019 18:31:32 +0300 Subject: [PATCH 026/357] added material controllers into backup and management --- .../backup-dilog/backup-dilog.component.html | 14 +++++++------- .../backup-dilog/backup-dilog.component.ts | 18 +++++++----------- .../src/app/administration/management/index.ts | 8 ++++++-- .../management/management.component.html | 4 ++-- .../management/management.component.ts | 11 ++++++++--- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html index 9c797ad667..f1f00f3cff 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html @@ -17,11 +17,11 @@ ~ under the License. --> - - +
+

Backup options

- - +
+
Backup options
-
- - +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts index 8b8ed616b1..1e75877775 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts @@ -17,9 +17,9 @@ * under the License. */ -import { Component, OnInit, ViewChild, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, ViewChild, Output, Inject } from '@angular/core'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; - +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { BackupOptionsModel } from '../management.model'; @Component({ @@ -32,17 +32,14 @@ export class BackupDilogComponent implements OnInit { public backupOptions: BackupOptionsModel = new BackupOptionsModel([], [], [], [], false, false); public valid: boolean = true; - @ViewChild('bindDialog') bindDialog; - @Output() backupOpts: EventEmitter<{}> = new EventEmitter(); + constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef, + ) { } ngOnInit() { this.backupOptions.setDegault(); - this.bindDialog.onClosing = () => this.backupOptions.setDegault(); - } - - public open(param): void { this.valid = true; - this.bindDialog.open(param); } public onHoldChanged($event, key): void { @@ -54,9 +51,8 @@ export class BackupDilogComponent implements OnInit { } public applyOptions(): void { - this.backupOpts.emit(this.backupOptions); this.backupOptions.setDegault(); - this.bindDialog.close(); + this.dialogRef.close(); } private checkValidity(): void { diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index 7d15b50f6f..44237985d5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -76,7 +76,11 @@ export * from './management.component'; SsnMonitorComponent, ManageRolesGroupsComponent ], - entryComponents: [ConfirmationDialogComponent, ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent], + entryComponents: [ + ConfirmationDialogComponent, + ConfirmActionDialogComponent, + ConfirmDeleteUserAccountDialogComponent, + BackupDilogComponent], exports: [ManagementComponent] }) -export class ManagenementModule {} +export class ManagenementModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index b0b2788cb0..e14404eddc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -42,8 +42,8 @@ - - + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index d898b8461a..736078f725 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -18,6 +18,7 @@ */ import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; +import { MatDialog } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import { Subscription } from 'rxjs'; @@ -33,6 +34,7 @@ import { import { EnvironmentModel, GeneralEnvironmentStatus } from './management.model'; import { HTTP_STATUS_CODES } from '../../core/util'; +import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; @Component({ selector: 'environments-management', @@ -58,14 +60,15 @@ export class ManagementComponent implements OnInit, OnDestroy { @ViewChild('rolesGroupsModal') rolesGroupsDialog; constructor( + public toastr: ToastrService, + public dialog: MatDialog, private healthStatusService: HealthStatusService, private backupService: BackupService, private manageEnvironmentsService: ManageEnvironmentsService, private userAccessKeyService: UserAccessKeyService, private userResourceService: UserResourceService, private rolesService: RolesGroupsService, - private storageService: StorageService, - public toastr: ToastrService + private storageService: StorageService ) {} ngOnInit() { @@ -100,7 +103,9 @@ export class ManagementComponent implements OnInit, OnDestroy { } showBackupDialog() { - if (!this.backupDialog.isOpened) this.backupDialog.open({ isFooter: false }); + // if (!this.backupDialog.isOpened) this.backupDialog.open({ isFooter: false }); + this.dialog.open(BackupDilogComponent) + .afterClosed().subscribe(() => this.buildGrid()); } getActiveUsersList() { From a6f04006f863aa37335f490d2a30dd0605076392 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 21 May 2019 01:02:31 +0300 Subject: [PATCH 027/357] added styles to redraw dialog boxes --- .../webapp/src/assets/styles/_dialogs.scss | 196 ++++++++++++++++++ .../webapp/src/assets/styles/_general.scss | 3 +- .../src/main/resources/webapp/src/styles.scss | 6 +- 3 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss new file mode 100644 index 0000000000..c148da0663 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -0,0 +1,196 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + .modal-xs { width: 375px; } + .modal-sm { width: 525px; } + .modal-md { width: 545px; } + .modal-lg { width: 580px; } + .modal-xl-s { width: 660px; } + .modal-xl { width: 900px; } + .modal-xxl { width: 1000px; } + +mat-dialog-container { + &.mat-dialog-container { + padding: 0; + border-radius: 0; + .box { + .dialog-header { + padding-left: 30px; + background: #f6fafe; + height: 50px; + line-height: 50px; + position: relative; + .modal-title { + width: 90%; + margin: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-weight: 600; + color: #455c74; + font-size: 18px; + background: #f6fafe; + i { + vertical-align: middle; + } + } + .close { + position: absolute; + top: 0; + right: 0; + height: 50px; + width: 50px; + font-size: 24px; + font-weight: 300; + border: 0; + background: none; + color: #577289; + outline: none; + cursor: pointer; + transition: all .45s ease-in-out; + &:hover { + color: #36afd5; + } + } + &.header-white { + background: #fff; + } + } + + .dialog-body { + padding-top: 0; + } + .upload-key { + margin-bottom: 20px; + & > div > div { + margin-top: 5px; + } + + .butt-file { + position: relative; + overflow: hidden; + margin-bottom: 10px; + display: inline-block; + color: #35afd5; + padding: 6px 29px 6px 23px; + width: 170px; + // font: 600 16px/1.45 'Open Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 1.45; + font-family:'Open Sans', sans-serif; + + text-align: center; + box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12); + .upload-icon { + background: url(/img/upload-icon.png) no-repeat; + background-size: 100%; + display: inline-block; + width: 17px; + height: 17px; + margin-right: 8px; + position: relative; + top: 2px; + } + input[type=file] { + width: 100%; + height: 100%; + position: absolute; + top: 0; + right: 0; + min-width: 100%; + min-height: 100%; + font-size: 100px; + text-align: right; + opacity: 0; + outline: none; + background: #fff; + cursor: inherit; + display: block; + } + &:active { + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + } + } + .butt-generate { + color: #35afd5; + width: 170px; + } + } + .btn-success { + margin-left: 40px; + margin-right: 2px; + } + .btn { + padding: 6px 15px; + min-width: 140px; + font-weight: 600; + } + a { + color: #35afd5; + text-decoration: none; + transition: all .45s ease-in-out; + &:hover { + color: #5faec7; + } + } + .info-label { + font-size: 16px; + margin-top: 20px; + } + .control-label { + font-weight: 600; + margin-top: 6px; + } + .form-group { + small { + font-size: 12px; + color: #9cadbe; + display: inline-block; + margin-top: 6px; + } + } + } + } +} +.content-box { + padding: 25px 30px 35px; +} + +.modal-content { + display: block; + position: relative; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid rgba(0,0,0,.2); + border-radius: 3px; + outline: 0; + -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); + box-shadow: 0 3px 9px rgba(0,0,0,.5); + .danger_color { + padding-left: 5px; + font-size: 12px; + display: inline-block; + font-family: 'Open Sans', sans-serif; + font-weight: 300; + border-color: #d9534f !important; + } +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss index 77278ca23e..5dedc17973 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss @@ -17,9 +17,10 @@ * under the License. */ +html, body { height: 100%; } body { font-family: 'Open Sans', sans-serif; - font-size: 16px; + font-size: 15px; overflow-x: hidden; font-weight: 300; } diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 07054f887d..3650353200 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -17,7 +17,7 @@ * under the License. */ -@import '~@angular/material/prebuilt-themes/deeppurple-amber.css'; +// @import '~@angular/material/prebuilt-themes/deeppurple-amber.css'; @import './assets/fonts/Material_Icons/material-icons.css'; @import './assets/fonts/Open_Sans/open-sans.css'; @@ -25,6 +25,7 @@ @import './assets/styles/_reset.scss'; @import './assets/styles/_general.scss'; @import './assets/styles/_theme.scss'; +@import './assets/styles/_dialogs.scss'; .mat-tab-label { font-family: 'Open Sans', sans-serif !important; @@ -383,6 +384,3 @@ input[type='number'] { } } } - -html, body { height: 100%; } -body { margin: 0; font-family: 'Roboto', sans-serif; } From c72bfa1b66a4dcbd975ea809d944d089e0311085 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 21 May 2019 01:03:59 +0300 Subject: [PATCH 028/357] fixed quota notification check --- .../webapp/src/app/shared/navbar/navbar.component.scss | 9 +++++++-- .../webapp/src/app/shared/navbar/navbar.component.ts | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss index a83cc778c3..b7b57a1187 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss @@ -132,7 +132,7 @@ a.nav-item { overflow: hidden; color: #577289; outline: none; - &:hover { + &:not(.has-children):hover { background: none !important; color: #36afd5; } @@ -153,7 +153,12 @@ a.nav-item { height: auto; } .sub-nav-item { - display: block; + display: block; + transition: all .45s ease-in-out; + &:hover { + background: none !important; + color: #36afd5; + } } } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index c5b2e7176c..72d4c33190 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -189,7 +189,7 @@ export class NavbarComponent implements OnInit, OnDestroy { private refreshSchedulerData(): void { this.schedulerService.getActiveSchcedulersData(this.CHECK_ACTIVE_SCHEDULE_PERIOD).subscribe((list: Array) => { if (list.length) { - if (this.dialog.openDialogs.length > 0 || this.dialog.openDialogs.length > 0) return; + if (this.dialog.openDialogs.length > 0) return; const filteredData = this.groupSchedulerData(list); const dialogRef: MatDialogRef = this.dialog.open(NotificationDialogComponent, { data: { template: filteredData, type: 'list' }, From 419c202f078e185f29011742e838090659e1a800 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 21 May 2019 13:30:54 +0300 Subject: [PATCH 029/357] added base create project form --- .../create-project.component.html | 44 +++++++++++++++ .../create-project.component.scss | 18 +++++++ .../create-project.component.ts | 54 +++++++++++++++++++ .../project/create-project/index.ts | 38 +++++++++++++ .../src/app/administration/project/index.ts | 2 + .../project/project.component.html | 14 ++++- .../project/project.component.ts | 4 ++ 7 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html new file mode 100644 index 0000000000..94e26f46f8 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html @@ -0,0 +1,44 @@ + + +
+
+ + + Project + Step 1 +
+ +
+ + +
+
+ + + Users + Step 2 + + + + + + + +
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss new file mode 100644 index 0000000000..7220975503 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss @@ -0,0 +1,18 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts new file mode 100644 index 0000000000..7b9126516b --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + import { Component, OnInit } from '@angular/core'; + import { FormGroup, FormBuilder, Validators } from '@angular/forms'; + +@Component({ + selector: 'create-project', + templateUrl: './create-project.component.html', + styleUrls: ['./create-project.component.scss'] +}) +export class CreateProjectComponent implements OnInit { + + public projectForm: FormGroup; + constructor( + private _fb: FormBuilder, + ) { } + + ngOnInit() { + this.initFormModel(); + } + + public createProject(data) { + console.log(data); + } + + public reset() { + this.initFormModel() + } + + private initFormModel(): void { + this.projectForm = this._fb.group({ + 'project_name': ['', Validators.required], + 'endpoint_name': ['', Validators.required], + 'users_list': [''] + }); + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts new file mode 100644 index 0000000000..5a7e62bc7a --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; + +import { MaterialModule } from '../../../shared/material.module'; + +import { CreateProjectComponent } from './create-project.component'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + MaterialModule + ], + declarations: [CreateProjectComponent], + exports: [CreateProjectComponent] +}) +export class CreateProjectModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts index 6b8e0f40d1..b6d413f221 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts @@ -25,6 +25,7 @@ import { MaterialModule } from '../../shared/material.module'; import { FormControlsModule } from '../../shared/form-controls'; import { ProjectComponent } from './project.component'; +import { CreateProjectModule } from './create-project'; @NgModule({ imports: [ @@ -32,6 +33,7 @@ import { ProjectComponent } from './project.component'; FormsModule, MaterialModule, FormControlsModule, + CreateProjectModule ], declarations: [ProjectComponent], exports: [ProjectComponent] diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 4d4b0d83db..41eaf79200 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -16,4 +16,16 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + +
+
+ +
+
+
+ + + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 75c222fe18..aacc32f59b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -31,4 +31,8 @@ export class ProjectComponent implements OnInit { ngOnInit() { } + createProject() { + console.log('çreate'); + + } } From 698ab8986901b76d3280478fd6ade0690bdbf623 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 21 May 2019 13:36:33 +0300 Subject: [PATCH 030/357] fixed dialog style files --- .../detail-dialog.component.html | 6 +- .../resources-grid.component.ts | 2 +- .../shared/modal-dialog/modal.component.scss | 162 +----------------- 3 files changed, 6 insertions(+), 164 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html index 347b1f9d71..c90af3480a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html @@ -17,8 +17,10 @@ ~ under the License. --> -
-
+
+
+ +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 1ef10e60d7..e6b4676bd5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -282,7 +282,7 @@ export class ResourcesGridComponent implements OnInit { printDetailEnvironmentModal(data): void { // this.detailDialog.open({ isFooter: false }, data); - this.dialog.open(DetailDialogComponent, { data: data }) + this.dialog.open(DetailDialogComponent, { data: data, panelClass: 'modal-lg' }) .afterClosed().subscribe(() => this.buildGrid()); } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss index 8a6c09d275..267fb3964d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss @@ -169,174 +169,14 @@ transition: all .35s linear .2s; } -.dialog-content { - display: block; - position: relative; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid rgba(0,0,0,.2); - border-radius: 3px; - outline: 0; - -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); - box-shadow: 0 3px 9px rgba(0,0,0,.5); - .danger_color { - padding-left: 5px; - font-size: 12px; - display: inline-block; - font-family: 'Open Sans', sans-serif; - font-weight: 300; - border-color: #d9534f !important; - } -} + .modal-footer .btn { margin-top: 0; } -.dialog { - .header-white { - .dialog-header { - background: #fff; - } - } - .dialog-header { - padding-left: 30px; - background: #f6fafe; - height: 54px; - line-height: 54px; - .modal-title { - width: 90%; - margin: 0; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - font-weight: 600; - color: #455c74; - font-size: 18px; - background: #f6fafe; - i { - vertical-align: middle; - } - } - .close { - position: absolute; - top: 0; - right: 0; - height: 50px; - width: 50px; - font-size: 24px; - border: 0; - background: none; - color: #577289; - outline: none; - cursor: pointer; - transition: all .45s ease-in-out; - &:hover { - color: #36afd5; - } - } - } - .dialog-body { - padding-top: 0; - } - .upload-key { - margin-bottom: 20px; - & > div > div { - margin-top: 5px; - } - .butt-file { - position: relative; - overflow: hidden; - margin-bottom: 10px; - display: inline-block; - color: #35afd5; - padding: 6px 29px 6px 23px; - width: 170px; - // font: 600 16px/1.45 'Open Sans'; - font-style: normal; - font-weight: 600; - font-size: 16px; - line-height: 1.45; - font-family:'Open Sans', sans-serif; - - text-align: center; - box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12); - - .upload-icon { - background: url(../../../assets/img/upload-icon.png) no-repeat; - background-size: 100%; - display: inline-block; - width: 17px; - height: 17px; - margin-right: 8px; - position: relative; - top: 2px; - } - input[type=file] { - width: 100%; - height: 100%; - position: absolute; - top: 0; - right: 0; - min-width: 100%; - min-height: 100%; - font-size: 100px; - text-align: right; - opacity: 0; - outline: none; - background: #fff; - cursor: inherit; - display: block; - } - &:active { - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); - } - } - .butt-generate { - color: #35afd5; - width: 170px; - } - } - .btn-success { - margin-left: 40px; - margin-right: 2px; - } - .btn { - padding: 6px 15px; - min-width: 140px; - font-weight: 600; - } - a { - color: #35afd5; - text-decoration: none; - transition: all .45s ease-in-out; - &:hover { - color: #5faec7; - } - } - .info-label { - font-size: 16px; - margin-top: 20px; - } - .control-label { - font-weight: 600; - margin-top: 6px; - } - .form-group { - small { - font-size: 12px; - color: #9cadbe; - display: inline-block; - margin-top: 6px; - } - } -} -.content-box { - padding: 25px 30px 35px; -} .detail-header { border-bottom: 0; width: 100%; From b4670d655f1bb9cff1a61630f48f363ad3e3ebe6 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 21 May 2019 17:56:47 +0300 Subject: [PATCH 031/357] added creation stepper; interface --- .../project/create-project/index.ts | 38 ------------------- .../project-form.component.html} | 38 ++++++++++++------- .../project-form.component.scss} | 0 .../project-form.component.ts} | 32 +++++++++++++--- 4 files changed, 52 insertions(+), 56 deletions(-) delete mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts rename services/self-service/src/main/resources/webapp/src/app/administration/project/{create-project/create-project.component.html => project-form/project-form.component.html} (50%) rename services/self-service/src/main/resources/webapp/src/app/administration/project/{create-project/create-project.component.scss => project-form/project-form.component.scss} (100%) rename services/self-service/src/main/resources/webapp/src/app/administration/project/{create-project/create-project.component.ts => project-form/project-form.component.ts} (55%) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts deleted file mode 100644 index 5a7e62bc7a..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/index.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { MaterialModule } from '../../../shared/material.module'; - -import { CreateProjectComponent } from './create-project.component'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - MaterialModule - ], - declarations: [CreateProjectComponent], - exports: [CreateProjectComponent] -}) -export class CreateProjectModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html similarity index 50% rename from services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html rename to services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 94e26f46f8..e5244d7bc6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -17,28 +17,40 @@ ~ under the License. --> -
+
Project - Step 1 -
- -
- - +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
Users - Step 2 - - - +
+ + + +
- -
\ No newline at end of file + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.scss rename to services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts similarity index 55% rename from services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts rename to services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 7b9126516b..b5a0861c26 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/create-project/create-project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -19,17 +19,23 @@ import { Component, OnInit } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; + import { ToastrService } from 'ngx-toastr'; + + import { ProjectService } from '../../../core/services'; + import { Project } from '../project.component'; @Component({ - selector: 'create-project', - templateUrl: './create-project.component.html', - styleUrls: ['./create-project.component.scss'] + selector: 'project-form', + templateUrl: './project-form.component.html', + styleUrls: ['./project-form.component.scss'] }) -export class CreateProjectComponent implements OnInit { +export class ProjectFormComponent implements OnInit { public projectForm: FormGroup; constructor( + public toastr: ToastrService, private _fb: FormBuilder, + private projectService: ProjectService ) { } ngOnInit() { @@ -38,6 +44,11 @@ export class CreateProjectComponent implements OnInit { public createProject(data) { console.log(data); + + this.projectService.createProject().subscribe(response => { + response && this.toastr.success('Project created successfully!', 'Success!'); + this.reset(); + }, error => this.toastr.error(error.message || 'Project creation failed!', 'Oops!')); } public reset() { @@ -48,7 +59,18 @@ export class CreateProjectComponent implements OnInit { this.projectForm = this._fb.group({ 'project_name': ['', Validators.required], 'endpoint_name': ['', Validators.required], - 'users_list': [''] + 'project_tag': [[], Validators.required], + 'users_list': ['dlab-'] + }); + } + + public editSpecificProject(item: Project) { + + this.projectForm = this._fb.group({ + 'project_name': [item.project_name, Validators.required], + 'endpoint_name': [item.endpoint_name,Validators.required], + 'project_tag': [item.project_tag, Validators.required], + 'users_list': [item.users_list, Validators.required] }); } } From f41f08d6dbbbae507a8a0701ab14b0a9a7eb049d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 21 May 2019 17:58:24 +0300 Subject: [PATCH 032/357] added service with methods to get and create project --- .../webapp/src/app/core/core.module.ts | 2 + .../applicationServiceFacade.service.ts | 15 ++++++ .../webapp/src/app/core/services/index.ts | 1 + .../src/app/core/services/project.service.ts | 46 +++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts index 9d073a2b8a..afb2ce1b0f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts @@ -37,6 +37,7 @@ import { ManageEnvironmentsService } from './services/managementEnvironments.ser import { RolesGroupsService } from './services/rolesManagement.service'; import { DataengineConfigurationService } from './services/dataengineConfiguration.service'; import { StorageService } from './services/storage.service'; +import { ProjectService } from './services/project.service'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; @@ -71,6 +72,7 @@ export class CoreModule { ApplicationServiceFacade, DataengineConfigurationService, StorageService, + ProjectService, { provide: MatDialogRef, useValue: {} }, { provide: MAT_DIALOG_DATA, useValue: [] } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index 79ae239406..3d1fced44f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -68,6 +68,7 @@ export class ApplicationServiceFacade { private static readonly BILLING = 'billing'; private static readonly DOWNLOAD_REPORT = 'download_report'; private static readonly SETTINGS = 'settings'; + private static readonly PROJECT = 'project'; private accessTokenKey: string = 'access_token'; private requestRegistry: Dictionary; @@ -521,6 +522,17 @@ export class ApplicationServiceFacade { null); } + public buildCreateProject(): Observable { + return this.buildRequest(RequestMethod.Post, + this.requestRegistry.Item(ApplicationServiceFacade.PROJECT), + null); + } + public buildGetProjectsList(): Observable { + return this.buildRequest(RequestMethod.Get, + this.requestRegistry.Item(ApplicationServiceFacade.PROJECT), + null); + } + private setupRegistry(): void { this.requestRegistry = new Dictionary(); @@ -593,6 +605,9 @@ export class ApplicationServiceFacade { // billing report this.requestRegistry.Add(ApplicationServiceFacade.BILLING, '/api/billing/report'); this.requestRegistry.Add(ApplicationServiceFacade.DOWNLOAD_REPORT, '/api/billing/report/download'); + + // project + this.requestRegistry.Add(ApplicationServiceFacade.PROJECT, '/api/project'); } private buildRequest(method: RequestMethod, url: string, body: any, opt?) { diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts index 4937cdd2e6..1bf598c2db 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts @@ -35,3 +35,4 @@ export * from './managementEnvironments.service'; export * from './rolesManagement.service'; export * from './dataengineConfiguration.service'; export * from './storage.service'; +export * from './project.service'; diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts new file mode 100644 index 0000000000..c15f1267a6 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { map, catchError } from 'rxjs/operators'; + +import { ApplicationServiceFacade } from './applicationServiceFacade.service'; +import { ErrorUtils } from '../util'; + +@Injectable() +export class ProjectService { + constructor(private applicationServiceFacade: ApplicationServiceFacade) { } + + public createProject(): Observable<{}> { + return this.applicationServiceFacade + .buildCreateProject() + .pipe( + map(response => response), + catchError(ErrorUtils.handleServiceError)); + } + + public getProjectsList(): Observable<{}> { + return this.applicationServiceFacade + .buildGetProjectsList() + .pipe( + map(response => response), + catchError(ErrorUtils.handleServiceError)); + } +} \ No newline at end of file From dd29b03a14402ff59fcdddc0d71d437ebbce3795 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 21 May 2019 17:59:17 +0300 Subject: [PATCH 033/357] rebuild stepper styles --- .../webapp/src/assets/styles/_dialogs.scss | 40 +++++++++--------- .../webapp/src/assets/styles/_theme.scss | 42 +++++++++++++++++++ 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index c148da0663..4a21f02fa6 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -174,23 +174,23 @@ mat-dialog-container { padding: 25px 30px 35px; } -.modal-content { - display: block; - position: relative; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid rgba(0,0,0,.2); - border-radius: 3px; - outline: 0; - -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); - box-shadow: 0 3px 9px rgba(0,0,0,.5); - .danger_color { - padding-left: 5px; - font-size: 12px; - display: inline-block; - font-family: 'Open Sans', sans-serif; - font-weight: 300; - border-color: #d9534f !important; - } -} \ No newline at end of file +// .modal-content { +// display: block; +// position: relative; +// background-color: #fff; +// -webkit-background-clip: padding-box; +// background-clip: padding-box; +// border: 1px solid rgba(0,0,0,.2); +// border-radius: 3px; +// outline: 0; +// -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); +// box-shadow: 0 3px 9px rgba(0,0,0,.5); +// .danger_color { +// padding-left: 5px; +// font-size: 12px; +// display: inline-block; +// font-family: 'Open Sans', sans-serif; +// font-weight: 300; +// border-color: #d9534f !important; +// } +// } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index df0b5dbcff..f52f2d9d37 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -258,6 +258,48 @@ } } +mat-horizontal-stepper { + .mat-step-header { + .mat-step-icon { + background-color: #36afd5; + } + .mat-step-label { + font-family: 'Open Sans', sans-serif; + font-size: 16px; + font-weight: 300; + } + } + &.stepper { + height: 190px; + margin-top: 10px; + .inner-step { + height: 70px; + padding: 5px; + display: flex; + justify-content: center; + flex-direction: column; + text-align: center; + input { + width: 490px; + align-self: center; + } + .caret { + i { + margin-top: 3px; + } + } + } + .text-center { + button { + &:not(:last-child) { + margin-right: 5px; + } + } + } + } +} + + .dashboard_table { &.reporting { .dropdown-multiselect { From 1d3c4ae8175336d402abadcf2d21d3c40afd8749 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 21 May 2019 18:01:52 +0300 Subject: [PATCH 034/357] added base projects list component --- .../src/app/administration/project/index.ts | 12 +++-- .../project/project-list/data.ts | 16 ++++++ .../project-list/project-list.component.html | 22 +++++++++ .../project-list/project-list.component.scss | 18 +++++++ .../project-list/project-list.component.ts | 49 +++++++++++++++++++ .../project/project.component.html | 4 +- .../project/project.component.ts | 10 +++- 7 files changed, 122 insertions(+), 9 deletions(-) create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts index b6d413f221..f04584c8ed 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts @@ -19,23 +19,25 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../shared/material.module'; import { FormControlsModule } from '../../shared/form-controls'; +import { ProjectFormComponent } from './project-form/project-form.component'; +import { ProjectListComponent } from './project-list/project-list.component'; + import { ProjectComponent } from './project.component'; -import { CreateProjectModule } from './create-project'; @NgModule({ imports: [ CommonModule, FormsModule, + ReactiveFormsModule, MaterialModule, - FormControlsModule, - CreateProjectModule + FormControlsModule ], - declarations: [ProjectComponent], + declarations: [ProjectComponent, ProjectFormComponent, ProjectListComponent], exports: [ProjectComponent] }) export class ProjectModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts new file mode 100644 index 0000000000..bef6b72add --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts @@ -0,0 +1,16 @@ +export const data = { + projects: [ + { + 'project_name': 'Test-project-1', + 'endpoint_name': 'test-endpoint', + 'project_tag': 'dlab-test-project-1', + 'users_list': ['user_1@example.com', 'user2@example.com'] + }, + { + 'project_name': 'Test-project-2', + 'endpoint_name': 'test-endpoint', + 'project_tag': 'dlab-test-project-1', + 'users_list': ['user_1@example.com', 'user2@example.com'] + } + ] +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html new file mode 100644 index 0000000000..3e890d6d91 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -0,0 +1,22 @@ + + +

+ project-list works! +

\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss new file mode 100644 index 0000000000..7220975503 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -0,0 +1,18 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts new file mode 100644 index 0000000000..f974ab6308 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + import { Component, OnInit } from '@angular/core'; + import { ToastrService } from 'ngx-toastr'; + + import { ProjectService } from '../../../core/services'; + import { Project } from '../project.component'; + + import { data } from './data'; + +@Component({ + selector: 'project-list', + templateUrl: './project-list.component.html', + styleUrls: ['./project-list.component.scss'] +}) +export class ProjectListComponent implements OnInit { + + projectsList: Project[]; + constructor( + public toastr: ToastrService, + private projectService: ProjectService) { } + + ngOnInit() { + this.getProjectsList(); + } + + getProjectsList() { + this.projectService.getProjectsList().subscribe( + (response: Project[]) => this.projectsList = response, + error => this.toastr.error(error.message || 'Receiving list failed!', 'Oops!')); + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 41eaf79200..9434da0bb0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -27,5 +27,5 @@
- - + + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index aacc32f59b..727e46bcaf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -19,6 +19,13 @@ import { Component, OnInit } from '@angular/core'; +export interface Project { + project_name: string; + endpoint_name: string; + project_tag: string; + users_list: string[]; +} + @Component({ selector: 'dlab-project', templateUrl: './project.component.html', @@ -32,7 +39,6 @@ export class ProjectComponent implements OnInit { } createProject() { - console.log('çreate'); - + console.log('create'); } } From ea1ce9d21907af45e97896e089257070ecb3ee00 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 22 May 2019 13:40:29 +0300 Subject: [PATCH 035/357] added project data table --- .../project-list/project-list.component.html | 32 +++++++++++++++++-- .../project-list/project-list.component.scss | 6 +++- .../project-list/project-list.component.ts | 13 ++++++-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 3e890d6d91..3c9ba7951e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -17,6 +17,32 @@ ~ under the License. --> -

- project-list works! -

\ No newline at end of file +
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
Project name {{element.project_name}} Endpoint name {{element.endpoint_name}} Project tag {{element.project_tag}} Action + more_vert +
+
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss index 7220975503..fb706f5f7a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -15,4 +15,8 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - */ \ No newline at end of file + */ + + table { + width: 100%; + } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index f974ab6308..df67b76793 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -19,12 +19,13 @@ import { Component, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; + import {MatTableDataSource} from '@angular/material'; import { ProjectService } from '../../../core/services'; import { Project } from '../project.component'; import { data } from './data'; - + @Component({ selector: 'project-list', templateUrl: './project-list.component.html', @@ -32,18 +33,24 @@ }) export class ProjectListComponent implements OnInit { - projectsList: Project[]; + displayedColumns: string[] = ['project_name', 'endpoint_name', 'project_tag']; + dataSource: any; + constructor( public toastr: ToastrService, private projectService: ProjectService) { } + ngOnInit() { this.getProjectsList(); } getProjectsList() { + // Project[] type + this.dataSource = new MatTableDataSource(data.projects); + this.projectService.getProjectsList().subscribe( - (response: Project[]) => this.projectsList = response, + (response: any) => this.dataSource = response, error => this.toastr.error(error.message || 'Receiving list failed!', 'Oops!')); } } From d11324b9ae473434a4d0fe580b2cb6027f532a1c Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 22 May 2019 13:45:46 +0300 Subject: [PATCH 036/357] added actions to datatable; controls fixes --- .../manage-roles-groups.component.html | 2 +- .../project-form/project-form.component.html | 41 +++++++++++-------- .../project-form/project-form.component.scss | 6 ++- .../project-list/project-list.component.html | 2 +- .../project-list/project-list.component.ts | 2 +- 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html index 85b751b493..b21d860f64 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html @@ -26,7 +26,7 @@

Manage roles

- + Groups
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index e5244d7bc6..04903ce162 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -22,33 +22,38 @@ Project -
-
- -
- +
+ +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
+ +
Users
- - + +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss index 7220975503..d1e5a3ae77 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss @@ -15,4 +15,8 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - */ \ No newline at end of file + */ + + .form-block { + width: 600px; + } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 3c9ba7951e..b9877ef481 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -35,7 +35,7 @@ {{element.project_tag}} - + Action more_vert diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index df67b76793..57bc9a422a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -33,7 +33,7 @@ }) export class ProjectListComponent implements OnInit { - displayedColumns: string[] = ['project_name', 'endpoint_name', 'project_tag']; + displayedColumns: string[] = ['project_name', 'endpoint_name', 'project_tag', 'actions']; dataSource: any; constructor( From 8a1cfaf17e52fcd9aeb0cd0d208ae3a982fbea37 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 22 May 2019 13:46:32 +0300 Subject: [PATCH 037/357] fixed general styles for steppers --- .../webapp/src/assets/styles/_general.scss | 1 + .../webapp/src/assets/styles/_theme.scss | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss index 5dedc17973..258cd3027e 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss @@ -100,6 +100,7 @@ textarea::placeholder { font-weight: 600; align-self: center; text-align: left; + font-family: 'Open Sans', sans-serif; } .control-group .control { width: 65%; diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index f52f2d9d37..446ab1c9b8 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -265,20 +265,17 @@ mat-horizontal-stepper { } .mat-step-label { font-family: 'Open Sans', sans-serif; - font-size: 16px; + font-size: 15px; font-weight: 300; } } &.stepper { - height: 190px; margin-top: 10px; .inner-step { - height: 70px; - padding: 5px; display: flex; justify-content: center; - flex-direction: column; - text-align: center; + align-items: center; + padding: 5px; input { width: 490px; align-self: center; @@ -296,6 +293,14 @@ mat-horizontal-stepper { } } } + &.roles { + height: 190px; + flex-direction: column; + text-align: center; + .inner-step { + height: 70px; + } + } } } From 72c166e99d6d31ac5d834a0f3baad47c35866af3 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 22 May 2019 14:37:57 +0300 Subject: [PATCH 038/357] added project tag generation on name focus out --- .../project-form/project-form.component.html | 5 +++-- .../project/project-form/project-form.component.ts | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 04903ce162..7579adfc4b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -28,7 +28,8 @@
- +
@@ -40,7 +41,7 @@
- +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index b5a0861c26..5da71d8231 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -45,22 +45,27 @@ export class ProjectFormComponent implements OnInit { public createProject(data) { console.log(data); - this.projectService.createProject().subscribe(response => { + this.projectService.createProject(data).subscribe(response => { response && this.toastr.success('Project created successfully!', 'Success!'); this.reset(); }, error => this.toastr.error(error.message || 'Project creation failed!', 'Oops!')); } public reset() { - this.initFormModel() + this.initFormModel(); + } + + public generateProjectTag($event) { + let user_tag = `dlab-${ $event.target.value }`; + this.projectForm.controls.project_tag.setValue(user_tag.toLowerCase()); } private initFormModel(): void { this.projectForm = this._fb.group({ 'project_name': ['', Validators.required], 'endpoint_name': ['', Validators.required], - 'project_tag': [[], Validators.required], - 'users_list': ['dlab-'] + 'project_tag': ['dlab-', Validators.required], + 'users_group': [[]] }); } From 0c389f18f5cfd6d43f08b147994ad1ced6cd785a Mon Sep 17 00:00:00 2001 From: bhliva Date: Wed, 22 May 2019 14:56:40 +0300 Subject: [PATCH 039/357] DLAB-000 added project + enpoint API --- .../src/ssn/files/aws/mongo_roles.json | 4 +- .../src/ssn/files/azure/mongo_roles.json | 4 +- .../src/ssn/files/gcp/mongo_roles.json | 4 +- services/self-service/pom.xml | 16 +++ .../backendapi/SelfServiceApplication.java | 34 +++++- .../epam/dlab/backendapi/dao/EndpointDAO.java | 13 ++ .../dlab/backendapi/dao/EndpointDAOImpl.java | 32 +++++ .../epam/dlab/backendapi/dao/ProjectDAO.java | 15 +++ .../dlab/backendapi/dao/ProjectDAOImpl.java | 39 ++++++ .../dlab/backendapi/domain/EndpointDTO.java | 11 ++ .../dlab/backendapi/domain/ProjectDTO.java | 14 +++ .../dlab/backendapi/modules/DevModule.java | 4 + .../resources/EndpointResource.java | 96 +++++++++++++++ .../backendapi/resources/ProjectResource.java | 115 ++++++++++++++++++ .../backendapi/service/EndpointService.java | 11 ++ .../backendapi/service/ProjectService.java | 13 ++ .../service/impl/EndpointServiceImpl.java | 37 ++++++ .../service/impl/ProjectServiceImpl.java | 51 ++++++++ 18 files changed, 506 insertions(+), 7 deletions(-) create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAO.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EndpointResource.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/EndpointService.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java diff --git a/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json b/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json index 68b31b6eb3..70eb16e45b 100644 --- a/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json +++ b/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json @@ -267,7 +267,9 @@ "/api/infrastructure/backup", "/roleManagement", "/api/settings", - "/user/settings" + "/user/settings", + "/api/project", + "/api/endpoint" ], "groups": [ "$anyuser" diff --git a/infrastructure-provisioning/src/ssn/files/azure/mongo_roles.json b/infrastructure-provisioning/src/ssn/files/azure/mongo_roles.json index fc11971122..58cadb3392 100644 --- a/infrastructure-provisioning/src/ssn/files/azure/mongo_roles.json +++ b/infrastructure-provisioning/src/ssn/files/azure/mongo_roles.json @@ -227,7 +227,9 @@ "/api/infrastructure/backup", "/roleManagement", "/api/settings", - "/user/settings" + "/user/settings", + "/api/project", + "/api/endpoint" ], "groups": [ "$anyuser" diff --git a/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json b/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json index 47ce720208..0dceb3c45f 100644 --- a/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json +++ b/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json @@ -227,7 +227,9 @@ "/api/infrastructure/backup", "/roleManagement", "/api/settings", - "/user/settings" + "/user/settings", + "/api/project", + "/api/endpoint" ], "groups": [ "$anyuser" diff --git a/services/self-service/pom.xml b/services/self-service/pom.xml index 552195831c..9ce6b727ad 100644 --- a/services/self-service/pom.xml +++ b/services/self-service/pom.xml @@ -90,6 +90,22 @@ + + io.swagger.core.v3 + swagger-core + 2.0.1 + + + io.swagger.core.v3 + swagger-jaxrs2 + 2.0.1 + + + io.swagger.core.v3 + swagger-integration + 2.0.1 + + com.jcraft jsch diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java index 979464fa97..508b34fe85 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java @@ -51,8 +51,11 @@ import io.dropwizard.jetty.BiDiGzipHandler; import io.dropwizard.setup.Bootstrap; import io.dropwizard.setup.Environment; -import io.federecio.dropwizard.swagger.SwaggerBundle; -import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration; +import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource; +import io.swagger.v3.oas.integration.SwaggerConfiguration; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Contact; +import io.swagger.v3.oas.models.info.Info; import lombok.extern.slf4j.Slf4j; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; @@ -60,6 +63,8 @@ import javax.servlet.DispatcherType; import java.util.EnumSet; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Self Service based on Dropwizard application. @@ -92,12 +97,13 @@ public void initialize(Bootstrap bootstrap) bootstrap.addBundle(new TemplateConfigBundle( new TemplateConfigBundleConfiguration().fileIncludePath(ServiceUtils.getConfPath()) )); - bootstrap.addBundle(new SwaggerBundle() { + + /*bootstrap.addBundle(new SwaggerBundle() { @Override protected SwaggerBundleConfiguration getSwaggerBundleConfiguration(SelfServiceApplicationConfiguration configuration) { return configuration.getSwaggerConfiguration(); } - }); + });*/ } @Override @@ -173,6 +179,26 @@ public void run(SelfServiceApplicationConfiguration configuration, Environment e jersey.register(injector.getInstance(UserGroupResource.class)); jersey.register(injector.getInstance(UserRoleResource.class)); jersey.register(injector.getInstance(ApplicationSettingResource.class)); + jersey.register(injector.getInstance(EndpointResource.class)); + jersey.register(injector.getInstance(ProjectResource.class)); + OpenAPI oas = new OpenAPI(); + Info info = new Info() + .title("Hello World API") + .version("2.1") + .description("RESTful greetings for you.") + .termsOfService("http://example.com/terms") + .contact(new Contact().email("john@example.com")); + + oas.info(info); + SwaggerConfiguration oasConfig = new SwaggerConfiguration() + .openAPI(oas) + .readAllResources(false) + .prettyPrint(true) + .resourceClasses(Stream.of(ProjectResource.class.getName(), + EndpointResource.class.getName()) + .collect(Collectors.toSet())); + environment.jersey().register(new OpenApiResource() + .openApiConfiguration(oasConfig)); } private void disableGzipHandlerForGuacamoleServlet(Server server) { diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAO.java new file mode 100644 index 0000000000..27aa6d78dc --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAO.java @@ -0,0 +1,13 @@ +package com.epam.dlab.backendapi.dao; + +import com.epam.dlab.backendapi.domain.EndpointDTO; + +import java.util.Optional; + +public interface EndpointDAO { + Optional get(String name); + + void create(EndpointDTO endpointDTO); + + void remove(String name); +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java new file mode 100644 index 0000000000..a7c0e7079d --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java @@ -0,0 +1,32 @@ +package com.epam.dlab.backendapi.dao; + +import com.epam.dlab.backendapi.domain.EndpointDTO; +import org.bson.conversions.Bson; + +import java.util.Optional; + +import static com.mongodb.client.model.Filters.eq; + +public class EndpointDAOImpl extends BaseDAO implements EndpointDAO { + + private static final String ENDPOINTS_COLLECTION = "endpoints"; + + @Override + public Optional get(String name) { + return findOne(ENDPOINTS_COLLECTION, endpointCondition(name), EndpointDTO.class); + } + + @Override + public void create(EndpointDTO endpointDTO) { + insertOne(ENDPOINTS_COLLECTION, endpointDTO); + } + + @Override + public void remove(String name) { + deleteOne(ENDPOINTS_COLLECTION, endpointCondition(name)); + } + + private Bson endpointCondition(String name) { + return eq("name", name); + } +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java new file mode 100644 index 0000000000..a8e18eab86 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -0,0 +1,15 @@ +package com.epam.dlab.backendapi.dao; + +import com.epam.dlab.backendapi.domain.ProjectDTO; + +import java.util.Optional; + +public interface ProjectDAO { + void create(ProjectDTO projectDTO); + + Optional get(String name); + + boolean update(ProjectDTO projectDTO); + + void remove(String name); +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java new file mode 100644 index 0000000000..0f6c6e7b05 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -0,0 +1,39 @@ +package com.epam.dlab.backendapi.dao; + +import com.epam.dlab.backendapi.domain.ProjectDTO; +import org.bson.Document; +import org.bson.conversions.Bson; + +import java.util.Optional; + +import static com.mongodb.client.model.Filters.eq; + +public class ProjectDAOImpl extends BaseDAO implements ProjectDAO { + + private static final String PROJECTS_COLLECTION = "Projects"; + + @Override + public void create(ProjectDTO projectDTO) { + insertOne(PROJECTS_COLLECTION, projectDTO); + } + + @Override + public Optional get(String name) { + return findOne(PROJECTS_COLLECTION, projectCondition(name), ProjectDTO.class); + } + + @Override + public boolean update(ProjectDTO projectDTO) { + return updateOne(PROJECTS_COLLECTION, projectCondition(projectDTO.getName()), + new Document(SET, convertToBson(projectDTO))).getMatchedCount() > 0L; + } + + @Override + public void remove(String name) { + + } + + private Bson projectCondition(String name) { + return eq("name", name); + } +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java new file mode 100644 index 0000000000..4e14f08312 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java @@ -0,0 +1,11 @@ +package com.epam.dlab.backendapi.domain; + +import lombok.Data; + +@Data +public class EndpointDTO { + + private final String name; + private final String url; + private final String account; +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java new file mode 100644 index 0000000000..2799a2efed --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -0,0 +1,14 @@ +package com.epam.dlab.backendapi.domain; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +import java.util.Set; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class ProjectDTO { + private final String name; + private final Set endpoints; + private final Set groups; +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java index bd4a5abc5e..2f6ae9b6a4 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java @@ -110,6 +110,10 @@ public UserInfo create(String name) { bind(ApplicationSettingService.class).to(ApplicationSettingServiceImpl.class); bind(UserSettingService.class).to(UserSettingServiceImpl.class); bind(GuacamoleService.class).to(GuacamoleServiceImpl.class); + bind(EndpointService.class).to(EndpointServiceImpl.class); + bind(EndpointDAO.class).to(EndpointDAOImpl.class); + bind(ProjectService.class).to(ProjectServiceImpl.class); + bind(ProjectDAO.class).to(ProjectDAOImpl.class); } /** diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EndpointResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EndpointResource.java new file mode 100644 index 0000000000..af3426eda6 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EndpointResource.java @@ -0,0 +1,96 @@ +package com.epam.dlab.backendapi.resources; + +import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.domain.EndpointDTO; +import com.epam.dlab.backendapi.service.EndpointService; +import com.epam.dlab.rest.dto.ErrorDTO; +import com.google.inject.Inject; +import io.dropwizard.auth.Auth; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.headers.Header; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; + +import javax.annotation.security.RolesAllowed; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; +import java.net.URI; + +@Path("endpoint") +@RolesAllowed("/api/endpoint") +public class EndpointResource { + + private final EndpointService endpointService; + @Context + private UriInfo uriInfo; + + @Inject + public EndpointResource(EndpointService endpointService) { + this.endpointService = endpointService; + } + + @Operation(summary = "Create endpoint", tags = "endpoint") + @ApiResponses({ + @ApiResponse(responseCode = "201", description = "Endpoint is successfully created", + headers = + @Header(required = true, name = "Location", description = "URI of created endpoint resource", + schema = @Schema(type = "string"))), + @ApiResponse(responseCode = "400", description = "Validation error", content = @Content(mediaType = + MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))), + @ApiResponse(responseCode = "409", description = "Endpoint with passed name already exist in system", + content = @Content(mediaType = MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @Consumes(MediaType.APPLICATION_JSON) + @POST + public Response createEndpoint(@Parameter(hidden = true) @Auth UserInfo userInfo, EndpointDTO endpointDTO) { + endpointService.create(endpointDTO); + final URI uri = uriInfo.getRequestUriBuilder().path(endpointDTO.getName()).build(); + return Response + .ok() + .location(uri) + .build(); + } + + @Operation(summary = "Get endpoint info", tags = "endpoint") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Return information about endpoint", + content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = + @Schema(implementation = EndpointDTO.class))), + @ApiResponse(responseCode = "404", description = "Endpoint with passed name not found", + content = @Content(mediaType = MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @GET + @Path("{name}") + public Response getEndpoint(@Parameter(hidden = true) @Auth UserInfo userInfo, + @Parameter(description = "Endpoint name") + @PathParam("name") String name) { + endpointService.get(name); + return Response.ok().build(); + } + + + @Operation(summary = "Remove endpoint", tags = "endpoint") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Endpoint is successfully removed"), + @ApiResponse(responseCode = "404", description = "Endpoint with passed name not found", + content = @Content(mediaType = MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @DELETE + @Path("{name}") + public Response removeEndpoint(@Parameter(hidden = true) @Auth UserInfo userInfo, + @Parameter(description = "Endpoint name") + @PathParam("name") String name) { + endpointService.remove(name); + return Response.ok().build(); + } +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java new file mode 100644 index 0000000000..4346601287 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -0,0 +1,115 @@ +package com.epam.dlab.backendapi.resources; + +import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.rest.dto.ErrorDTO; +import com.google.inject.Inject; +import io.dropwizard.auth.Auth; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.headers.Header; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; + +import javax.annotation.security.RolesAllowed; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; +import java.net.URI; + +@Path("project") +@RolesAllowed("/api/project") +public class ProjectResource { + private final ProjectService projectService; + @Context + private UriInfo uriInfo; + + @Inject + public ProjectResource(ProjectService projectService) { + this.projectService = projectService; + } + + + @Operation(summary = "Create project", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "201", description = "Project is successfully created", + headers = + @Header(required = true, name = "Location", description = "URI of created project resource", + schema = @Schema(type = "string"))), + @ApiResponse(responseCode = "400", description = "Validation error", content = @Content(mediaType = + MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))), + @ApiResponse(responseCode = "409", description = "Project with passed name already exist in system", + content = @Content(mediaType = MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @POST + @Consumes(MediaType.APPLICATION_JSON) + public Response createProject(@Parameter(hidden = true) @Auth UserInfo userInfo, ProjectDTO projectDTO) { + projectService.create(projectDTO); + final URI uri = uriInfo.getRequestUriBuilder().path(projectDTO.getName()).build(); + return Response + .ok() + .location(uri) + .build(); + } + + + @Operation(summary = "Get project info", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Return information about project", + content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = + @Schema(implementation = ProjectDTO.class))), + @ApiResponse(responseCode = "404", description = "Project with passed name not found", + content = @Content(mediaType = MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @GET + @Path("{name}") + @Produces(MediaType.APPLICATION_JSON) + public Response getProject(@Parameter(hidden = true) @Auth UserInfo userInfo, + @Parameter(description = "Project name") + @PathParam("name") String name) { + return Response + .ok(projectService.get(name)) + .build(); + } + + @Operation(summary = "Update project", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Project is successfully updated"), + @ApiResponse(responseCode = "400", description = "Validation error", content = @Content(mediaType = + MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))), + @ApiResponse(responseCode = "404", description = "Project with passed name not found", + content = @Content(mediaType = MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @PUT + public Response updateProject(@Parameter(hidden = true) @Auth UserInfo userInfo, ProjectDTO projectDTO) { + projectService.update(projectDTO); + return Response.ok().build(); + } + + @Operation(summary = "Remove project", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Project is successfully removed"), + @ApiResponse(responseCode = "404", description = "Project with passed name not found", + content = @Content(mediaType = MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @DELETE + @Path("{name}") + public Response removeProject( + @Parameter(hidden = true) @Auth UserInfo userInfo, + @Parameter(description = "Project name") + @PathParam("name") String name) { + projectService.remove(name); + return Response.ok().build(); + } +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EndpointService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EndpointService.java new file mode 100644 index 0000000000..1f3161f454 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EndpointService.java @@ -0,0 +1,11 @@ +package com.epam.dlab.backendapi.service; + +import com.epam.dlab.backendapi.domain.EndpointDTO; + +public interface EndpointService { + EndpointDTO get(String name); + + void create(EndpointDTO endpointDTO); + + void remove(String name); +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java new file mode 100644 index 0000000000..9619f87447 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -0,0 +1,13 @@ +package com.epam.dlab.backendapi.service; + +import com.epam.dlab.backendapi.domain.ProjectDTO; + +public interface ProjectService { + void create(ProjectDTO projectDTO); + + ProjectDTO get(String name); + + void remove(String name); + + void update(ProjectDTO projectDTO); +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java new file mode 100644 index 0000000000..a4586a8054 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java @@ -0,0 +1,37 @@ +package com.epam.dlab.backendapi.service.impl; + +import com.epam.dlab.backendapi.dao.EndpointDAO; +import com.epam.dlab.backendapi.domain.EndpointDTO; +import com.epam.dlab.backendapi.service.EndpointService; +import com.epam.dlab.exceptions.ResourceConflictException; +import com.epam.dlab.exceptions.ResourceNotFoundException; +import com.google.inject.Inject; + +public class EndpointServiceImpl implements EndpointService { + private final EndpointDAO endpointDAO; + + @Inject + public EndpointServiceImpl(EndpointDAO endpointDAO) { + this.endpointDAO = endpointDAO; + } + + @Override + public EndpointDTO get(String name) { + return endpointDAO.get(name) + .orElseThrow(() -> new ResourceNotFoundException("Endpoint with name " + name + " not found")); + } + + @Override + public void create(EndpointDTO endpointDTO) { + if (!endpointDAO.get(endpointDTO.getName()).isPresent()) { + endpointDAO.create(endpointDTO); + } else { + throw new ResourceConflictException("Project with passed name already exist in system"); + } + } + + @Override + public void remove(String name) { + endpointDAO.remove(name); + } +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java new file mode 100644 index 0000000000..523067473b --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -0,0 +1,51 @@ +package com.epam.dlab.backendapi.service.impl; + +import com.epam.dlab.backendapi.dao.ProjectDAO; +import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.exceptions.ResourceConflictException; +import com.epam.dlab.exceptions.ResourceNotFoundException; +import com.google.inject.Inject; + +import java.util.function.Supplier; + +public class ProjectServiceImpl implements ProjectService { + + private final ProjectDAO projectDAO; + + @Inject + public ProjectServiceImpl(ProjectDAO projectDAO) { + this.projectDAO = projectDAO; + } + + @Override + public void create(ProjectDTO projectDTO) { + if (!projectDAO.get(projectDTO.getName()).isPresent()) { + projectDAO.create(projectDTO); + } else { + throw new ResourceConflictException("Project with passed name already exist in system"); + } + } + + @Override + public ProjectDTO get(String name) { + return projectDAO.get(name) + .orElseThrow(projectNotFound()); + } + + @Override + public void remove(String name) { + projectDAO.remove(name); + } + + @Override + public void update(ProjectDTO projectDTO) { + if (!projectDAO.update(projectDTO)) { + throw projectNotFound().get(); + } + } + + private Supplier projectNotFound() { + return () -> new ResourceNotFoundException("Project with passed name not found"); + } +} From 0859f8bfeb028bec28dfb174398605fd84867a0e Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 22 May 2019 18:09:19 +0300 Subject: [PATCH 040/357] fixed detailed dialogs styles; added variables --- .../cluster-details/cluster-details.component.html | 6 ++++-- .../computational-resources-list.component.ts | 2 +- .../detail-dialog/detail-dialog.component.html | 2 +- .../resources/webapp/src/assets/styles/_dialogs.scss | 11 +++++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html index 7420257b01..ef38a47ff1 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html @@ -17,8 +17,10 @@ ~ under the License. --> -
-
+
+
+ +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts index 713b5ceaf8..4004adf4b0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts @@ -82,7 +82,7 @@ export class ComputationalResourcesListComponent { detailComputationalResources(environment, resource): void { // this.detailComputationalResource.open({ isFooter: false }, environment, resource); - this.dialog.open(DetailComputationalResourcesComponent, { data: { environment, resource }}) + this.dialog.open(DetailComputationalResourcesComponent, { data: { environment, resource }, panelClass: 'modal-sm'}) .afterClosed().subscribe(() => this.rebuildGrid()); }; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html index c90af3480a..4420236d82 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
+
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index 4a21f02fa6..6c3f9bb2ad 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -17,6 +17,8 @@ * under the License. */ + @import '_variables.scss'; + .modal-xs { width: 375px; } .modal-sm { width: 525px; } .modal-md { width: 545px; } @@ -29,10 +31,11 @@ mat-dialog-container { &.mat-dialog-container { padding: 0; border-radius: 0; - .box { + .dialog-box { + color: $modal-text-color; .dialog-header { padding-left: 30px; - background: #f6fafe; + background: $modal-header-color; height: 50px; line-height: 50px; position: relative; @@ -45,7 +48,7 @@ mat-dialog-container { font-weight: 600; color: #455c74; font-size: 18px; - background: #f6fafe; + background: $modal-header-color; i { vertical-align: middle; } @@ -152,7 +155,7 @@ mat-dialog-container { } } .info-label { - font-size: 16px; + font-size: 15px; margin-top: 20px; } .control-label { From 19d84b271b43047e07861df944f8ee35427dc1a8 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 22 May 2019 18:11:16 +0300 Subject: [PATCH 041/357] passed data as project creation params to service --- .../src/app/core/services/applicationServiceFacade.service.ts | 4 ++-- .../resources/webapp/src/app/core/services/project.service.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index 3d1fced44f..5085056030 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -522,10 +522,10 @@ export class ApplicationServiceFacade { null); } - public buildCreateProject(): Observable { + public buildCreateProject(data): Observable { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.PROJECT), - null); + data); } public buildGetProjectsList(): Observable { return this.buildRequest(RequestMethod.Get, diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts index c15f1267a6..2f33dcc703 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts @@ -28,9 +28,9 @@ import { ErrorUtils } from '../util'; export class ProjectService { constructor(private applicationServiceFacade: ApplicationServiceFacade) { } - public createProject(): Observable<{}> { + public createProject(data): Observable<{}> { return this.applicationServiceFacade - .buildCreateProject() + .buildCreateProject(data) .pipe( map(response => response), catchError(ErrorUtils.handleServiceError)); From d696f0ec9496f9c9f345b56526f40c82ac01598c Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 22 May 2019 18:12:32 +0300 Subject: [PATCH 042/357] added actions placeholders to project list --- .../project/project-list/project-list.component.html | 12 +++++++++--- .../project/project-list/project-list.component.ts | 10 +++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index b9877ef481..f3cbe3891a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -36,10 +36,16 @@ -
- + + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index 57bc9a422a..1f238f364e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -45,7 +45,15 @@ export class ProjectListComponent implements OnInit { this.getProjectsList(); } - getProjectsList() { + public editProject(item: Project[]) { + debugger; + } + + public deleteProject(item: Project[]) { + debugger; + } + + private getProjectsList() { // Project[] type this.dataSource = new MatTableDataSource(data.projects); From 136c0043e9a76acb007302c4c428892a4dac5a6e Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 14:54:29 +0300 Subject: [PATCH 043/357] added groups list select with ability check/delete all --- .../project-form/project-form.component.ts | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 5da71d8231..b6650a8b08 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -21,7 +21,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; - import { ProjectService } from '../../../core/services'; + import { ProjectService,RolesGroupsService } from '../../../core/services'; import { Project } from '../project.component'; @Component({ @@ -32,17 +32,23 @@ export class ProjectFormComponent implements OnInit { public projectForm: FormGroup; + public groupsList: any; + public setupGroupsList = []; + constructor( public toastr: ToastrService, private _fb: FormBuilder, - private projectService: ProjectService + private projectService: ProjectService, + private rolesService: RolesGroupsService ) { } ngOnInit() { this.initFormModel(); + this.getGroupsData(); } public createProject(data) { + // let parameters = {...data, users: this.setupGroupsList }; console.log(data); this.projectService.createProject(data).subscribe(response => { @@ -60,11 +66,16 @@ export class ProjectFormComponent implements OnInit { this.projectForm.controls.project_tag.setValue(user_tag.toLowerCase()); } + public selectOptions(select) { + debugger; + this.projectForm.controls.users_group.setValue(select ? this.groupsList : []); + } + private initFormModel(): void { this.projectForm = this._fb.group({ 'project_name': ['', Validators.required], 'endpoint_name': ['', Validators.required], - 'project_tag': ['dlab-', Validators.required], + 'project_tag': ['', Validators.required], 'users_group': [[]] }); } @@ -78,4 +89,10 @@ export class ProjectFormComponent implements OnInit { 'users_list': [item.users_list, Validators.required] }); } + + private getGroupsData() { + this.rolesService.getGroupsData().subscribe( + (list: any) => this.groupsList = list.map(el => el.group), + error => this.toastr.error(error.message, 'Oops!')); + } } From 1ef8fb66c2d86502d3da989be34aba9a089cf7d3 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 14:55:20 +0300 Subject: [PATCH 044/357] added view to groups list control --- .../project-form/project-form.component.html | 44 ++++++++++++++++--- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 7579adfc4b..371dae86e4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -17,12 +17,12 @@ ~ under the License. --> - +
Project -
+
@@ -44,17 +44,47 @@
+
+ + +
Users -
- - - +
+
+
+
+ + + + + playlist_add_check All + + + clear None + + + + {{ group }} + + + + +
+
+
+ + + +
+
From 5a81d01f5d15460ff187cbddca7cec00d9156063 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 14:56:29 +0300 Subject: [PATCH 045/357] added view to groups list control; stepper control changes --- .../project-form/project-form.component.scss | 9 +- .../webapp/src/assets/styles/_theme.scss | 97 ++++++++++++++++++- 2 files changed, 101 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss index d1e5a3ae77..8686a652e7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss @@ -17,6 +17,9 @@ * under the License. */ - .form-block { - width: 600px; - } \ No newline at end of file +.form-block { + width: 600px; + .next { + margin-left: 25px; + } +} diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 446ab1c9b8..41a2d2e44f 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -63,6 +63,68 @@ } } +.selector-wrapper { + display: flex; + align-self: center; + width: 100%; + height: 36px; + padding-left: 10px; + font-family: 'Open Sans', sans-serif; + font-size: 15px; + font-weight: 300; + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + mat-form-field { + width: 100%; + .mat-form-field-wrapper { + padding-bottom: 0; + } + .mat-icon { + font-size: 20px; + } + .caret { + width: 40px; + color: #4ab8dc; + border: none; + border-left: 1px solid #ececec; + background-color: #fff; + position: absolute; + right: 0; + top: 0px; + height: 36px; + cursor: pointer; + &.not-allowed { + background-color: #dcdcdc; + } + } + } +} + +.multiple-select { + border-bottom: 1px solid #dedbdb; + padding: 0; + a { + display: inline-block; + width: 50%; + padding: 0 15px; + vertical-align: middle; + color: #575757; + cursor: pointer; + i { + vertical-align: sub; + font-size: 20px; + } + &:hover { + color: #4eaf3e; + background: #f9fafb; + } + &.deselect { + &:hover { + color: #f1696e; + } + } + } +} + .mat-button-focus-overlay { background-color: rgba(255, 0, 0, 0) !important; } @@ -169,7 +231,7 @@ white-space: pre-line !important; word-break: break-all; } -.manage-roles-dialog { +.manage-roles-dialog, .project-form { .mat-form-field { width: 100%; } @@ -277,7 +339,7 @@ mat-horizontal-stepper { align-items: center; padding: 5px; input { - width: 490px; + width: 100%; align-self: center; } .caret { @@ -299,11 +361,42 @@ mat-horizontal-stepper { text-align: center; .inner-step { height: 70px; + input { + width: 490px; + } } } } } +.multiple-select { + border-bottom: 1px solid #dedbdb; + padding: 0 !important; + a { + display: inline-block; + width: 50%; + padding: 0 15px; + vertical-align: middle; + color: #575757; + cursor: pointer; + i { + vertical-align: sub; + font-size: 20px; + } + &:hover { + color: #4eaf3e; + background: #f9fafb; + } + &.deselect { + &:hover { + color: #f1696e; + } + } + } + mat-pseudo-checkbox { + display: none; + } +} .dashboard_table { &.reporting { From 62c401c6a603d2d9c5bf8d2b08a76c3c9e761340 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 16:55:47 +0300 Subject: [PATCH 046/357] added project-data.service --- .../src/app/administration/project/index.ts | 2 + .../project/project-data.service.ts | 50 +++++++++++++++++++ .../cluster-details.component.html | 2 +- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts index f04584c8ed..4dfc82f48f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts @@ -28,6 +28,7 @@ import { ProjectFormComponent } from './project-form/project-form.component'; import { ProjectListComponent } from './project-list/project-list.component'; import { ProjectComponent } from './project.component'; +import { ProjectDataService } from './project-data.service'; @NgModule({ imports: [ @@ -38,6 +39,7 @@ import { ProjectComponent } from './project.component'; FormControlsModule ], declarations: [ProjectComponent, ProjectFormComponent, ProjectListComponent], + providers: [ProjectDataService], exports: [ProjectComponent] }) export class ProjectModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts new file mode 100644 index 0000000000..1bba48a8f2 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Injectable } from '@angular/core'; + +import { ProjectService } from '../../core/services'; +import { Project } from './project.component'; + +import { data } from './project-list/data'; +@Injectable() +export class ProjectDataService { + dataSource: any; + // Project[]; + + constructor(private projectService: ProjectService) { + this.getProjectsList(); + } + + get getProjects() { + return this.dataSource; + } + + public updateProjects() { + this.getProjectsList(); + } + + private getProjectsList() { + this.dataSource = data.projects; + + + this.projectService.getProjectsList().subscribe( + (response: any) => this.dataSource = data.projects); + } +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html index ef38a47ff1..d341eb72fa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html @@ -21,7 +21,7 @@
-
+
Action - more_vert + + + mode_edit + + + delete_forever +
From cac09f9059d95422460bcd882d1158dd66a4a29a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 16:57:01 +0300 Subject: [PATCH 047/357] added endpoint.service to get list --- .../webapp/src/app/core/core.module.ts | 2 + .../src/app/core/services/endpoint.service.ts | 42 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts index afb2ce1b0f..02806654d6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts @@ -38,6 +38,7 @@ import { RolesGroupsService } from './services/rolesManagement.service'; import { DataengineConfigurationService } from './services/dataengineConfiguration.service'; import { StorageService } from './services/storage.service'; import { ProjectService } from './services/project.service'; +import { EndpointService } from './services/endpoint.service'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; @@ -73,6 +74,7 @@ export class CoreModule { DataengineConfigurationService, StorageService, ProjectService, + EndpointService, { provide: MatDialogRef, useValue: {} }, { provide: MAT_DIALOG_DATA, useValue: [] } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts new file mode 100644 index 0000000000..91caed7c8f --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; + +import { ErrorUtils } from '../util'; +import { ApplicationServiceFacade } from './applicationServiceFacade.service'; + +@Injectable() +export class EndpointService { + + constructor( + private applicationServiceFacade: ApplicationServiceFacade + ) { } + + public getEndpointsData(): Observable<{}> { + return this.applicationServiceFacade + .buildGetEndpointsData() + .pipe( + map(response => response), + catchError(ErrorUtils.handleServiceError)); + } +} + From 9288943bcc59834a0677d6438c8308b884265401 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 16:58:03 +0300 Subject: [PATCH 048/357] provide variables reference to config file --- .../src/main/resources/webapp/angular.json | 5 ++++ .../webapp/src/assets/styles/_variables.scss | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss diff --git a/services/self-service/src/main/resources/webapp/angular.json b/services/self-service/src/main/resources/webapp/angular.json index 6e27247649..1b5825ff0c 100644 --- a/services/self-service/src/main/resources/webapp/angular.json +++ b/services/self-service/src/main/resources/webapp/angular.json @@ -28,6 +28,11 @@ "src/styles.scss", "node_modules/ngx-toastr/toastr.css" ], + "stylePreprocessorOptions": { + "includePaths": [ + "src/assets/styles" + ] + }, "scripts": [ ] }, diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss new file mode 100644 index 0000000000..538128b546 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss @@ -0,0 +1,23 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +$modal-text-color: #718aa5; +$modal-header-color: #f6fafe; + +$brand-color: #4ab8dc; \ No newline at end of file From 42d075efbb2c45d10939d43ab167882e4860aa41 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 16:58:42 +0300 Subject: [PATCH 049/357] added analyser tool --- .../main/resources/webapp/package-lock.json | 163 ++++++++++++++++++ .../src/main/resources/webapp/package.json | 8 +- 2 files changed, 168 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/package-lock.json b/services/self-service/src/main/resources/webapp/package-lock.json index 3a6aa79457..74c3766727 100644 --- a/services/self-service/src/main/resources/webapp/package-lock.json +++ b/services/self-service/src/main/resources/webapp/package-lock.json @@ -1857,6 +1857,12 @@ "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", "dev": true }, + "acorn-walk": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz", + "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==", + "dev": true + }, "agentkeepalive": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz", @@ -2124,6 +2130,12 @@ "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", "dev": true }, + "async-limiter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", + "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -2360,6 +2372,18 @@ "tweetnacl": "0.14.5" } }, + "bfj": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.1.tgz", + "integrity": "sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "check-types": "7.4.0", + "hoopy": "0.1.4", + "tryer": "1.0.1" + } + }, "big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", @@ -2758,6 +2782,12 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "check-types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz", + "integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==", + "dev": true + }, "chokidar": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", @@ -3658,6 +3688,12 @@ "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.1.tgz", "integrity": "sha512-fqoTi6oQ881wYRENIEmz78hKVoc3X9HqVpklo419yxzebys6dtU5c83iVh3UYvvexPFdAuwlDYCsUM9//CrMMg==" }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev": true + }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", @@ -3686,6 +3722,12 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, + "ejs": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz", + "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==", + "dev": true + }, "electron-to-chromium": { "version": "1.3.113", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz", @@ -4243,6 +4285,12 @@ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", "dev": true }, + "filesize": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", + "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==", + "dev": true + }, "fill-range": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", @@ -5120,6 +5168,24 @@ "resolved": "https://registry.npmjs.org/guacamole-common-js/-/guacamole-common-js-1.0.0-b.tgz", "integrity": "sha512-DLEy7yBQvwwJ4xoWfj1Z+DLOKCy5zwW4ELdpDeYKVWZMpBegbGGwI5qWb61b3aT7KBWsF6DRJHviPlcFHUdMRA==" }, + "gzip-size": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz", + "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "pify": "4.0.1" + }, + "dependencies": { + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true + } + } + }, "handle-thing": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz", @@ -5309,6 +5375,12 @@ "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==", "dev": true }, + "hoopy": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", + "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==", + "dev": true + }, "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", @@ -7845,6 +7917,12 @@ "mimic-fn": "1.2.0" } }, + "opener": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz", + "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==", + "dev": true + }, "opn": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz", @@ -10317,6 +10395,12 @@ "glob": "7.1.2" } }, + "tryer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", + "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==", + "dev": true + }, "ts-node": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-2.0.0.tgz", @@ -12043,6 +12127,76 @@ } } }, + "webpack-bundle-analyzer": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz", + "integrity": "sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==", + "dev": true, + "requires": { + "acorn": "6.0.7", + "acorn-walk": "6.1.1", + "bfj": "6.1.1", + "chalk": "2.4.2", + "commander": "2.20.0", + "ejs": "2.6.1", + "express": "4.16.4", + "filesize": "3.6.1", + "gzip-size": "5.1.1", + "lodash": "4.17.11", + "mkdirp": "0.5.1", + "opener": "1.5.1", + "ws": "6.2.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.3" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "commander": { + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, "webpack-core": { "version": "0.6.9", "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", @@ -13543,6 +13697,15 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, + "ws": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "dev": true, + "requires": { + "async-limiter": "1.0.0" + } + }, "xhr2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz", diff --git a/services/self-service/src/main/resources/webapp/package.json b/services/self-service/src/main/resources/webapp/package.json index 2154b3cff2..4ab494b146 100644 --- a/services/self-service/src/main/resources/webapp/package.json +++ b/services/self-service/src/main/resources/webapp/package.json @@ -9,8 +9,9 @@ "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", - "build.dev": "ng build --build-optimizer=false", - "build.prod": "ng build --prod" + "build.dev": "ng build --build-optimizer=false --stats-json", + "build.prod": "ng build --prod --stats-json", + "analyse": "webpack-bundle-analyzer dist/stats.json" }, "private": true, "dependencies": { @@ -48,6 +49,7 @@ "node-sass": "^4.7.2", "ts-node": "~2.0.0", "tslint": "^5.15.0", - "typescript": "^3.2.4" + "typescript": "^3.2.4", + "webpack-bundle-analyzer": "^3.3.2" } } From d537007031ebae8e1b7e1363ebdd8e2fd7e63250 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 17:02:02 +0300 Subject: [PATCH 050/357] changed control type for endpoints; added service call --- .../project-form/project-form.component.html | 147 ++++++++++-------- .../project-form/project-form.component.ts | 27 ++-- 2 files changed, 102 insertions(+), 72 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 371dae86e4..a579ace0b9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -17,76 +17,99 @@ ~ under the License. --> - - - - - Project -
+ + + + Project +
-
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+ +
+
+ + + + + playlist_add_check All + + + clear None + + + + {{ group }} + + + +
-
- - + +
+ +
+
+
+ + +
+
-
- - - Users -
-
-
-
- - - - - playlist_add_check All - - - clear None - - - - {{ group }} - - - - -
-
-
- - - +
+ + + Users +
+
+
+
+ + + + + playlist_add_check All + + + clear None + + + + {{ group }} + + + +
+
+ + + +
- - - - \ No newline at end of file +
+ + + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index b6650a8b08..f1f936f3b9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -21,7 +21,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; - import { ProjectService,RolesGroupsService } from '../../../core/services'; + import { ProjectService,RolesGroupsService, EndpointService } from '../../../core/services'; import { Project } from '../project.component'; @Component({ @@ -32,23 +32,24 @@ export class ProjectFormComponent implements OnInit { public projectForm: FormGroup; - public groupsList: any; - public setupGroupsList = []; + public groupsList: any = []; + public endpointsList: any = []; constructor( public toastr: ToastrService, private _fb: FormBuilder, private projectService: ProjectService, - private rolesService: RolesGroupsService + private rolesService: RolesGroupsService, + private endpointService: EndpointService ) { } ngOnInit() { this.initFormModel(); this.getGroupsData(); + this.getEndpointsData(); } public createProject(data) { - // let parameters = {...data, users: this.setupGroupsList }; console.log(data); this.projectService.createProject(data).subscribe(response => { @@ -66,17 +67,17 @@ export class ProjectFormComponent implements OnInit { this.projectForm.controls.project_tag.setValue(user_tag.toLowerCase()); } - public selectOptions(select) { + public selectOptions(list, key, select?) { debugger; - this.projectForm.controls.users_group.setValue(select ? this.groupsList : []); + this.projectForm.controls[key].setValue(select ? list : []); } private initFormModel(): void { this.projectForm = this._fb.group({ 'project_name': ['', Validators.required], - 'endpoint_name': ['', Validators.required], + 'endpoints_list': [[], Validators.required], 'project_tag': ['', Validators.required], - 'users_group': [[]] + 'users_group': [[], Validators.required] }); } @@ -84,7 +85,7 @@ export class ProjectFormComponent implements OnInit { this.projectForm = this._fb.group({ 'project_name': [item.project_name, Validators.required], - 'endpoint_name': [item.endpoint_name,Validators.required], + 'endpoints_list': [item.endpoints_list,Validators.required], 'project_tag': [item.project_tag, Validators.required], 'users_list': [item.users_list, Validators.required] }); @@ -95,4 +96,10 @@ export class ProjectFormComponent implements OnInit { (list: any) => this.groupsList = list.map(el => el.group), error => this.toastr.error(error.message, 'Oops!')); } + + private getEndpointsData() { + this.endpointService.getEndpointsData().subscribe( + list => this.endpointsList = list, + error => this.toastr.error(error.message, 'Oops!')); + } } From e40ba21f00801adf0ead217cd36939ec406bc441 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 17:03:23 +0300 Subject: [PATCH 051/357] added project form wrapper in case of rendering check --- .../src/app/administration/project/project.component.html | 5 ++++- .../src/app/administration/project/project.component.ts | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 9434da0bb0..b942896845 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -27,5 +27,8 @@
- + + + + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 727e46bcaf..1baea705a2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -18,10 +18,11 @@ */ import { Component, OnInit } from '@angular/core'; +import { ProjectDataService } from './project-data.service'; export interface Project { project_name: string; - endpoint_name: string; + endpoints_list: string[]; project_tag: string; users_list: string[]; } @@ -32,10 +33,11 @@ export interface Project { styleUrls: ['./project.component.scss'] }) export class ProjectComponent implements OnInit { - - constructor() { } + projectsList: Project[] = []; + constructor(private projectDataService: ProjectDataService) { } ngOnInit() { + this.projectsList = this.projectDataService.getProjects; } createProject() { From f7ffeff2b8bc33407d479bc1e017b145d5f16713 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 17:04:24 +0300 Subject: [PATCH 052/357] mock dource data to render data grid --- .../project-list/project-list.component.html | 4 ++-- .../project-list/project-list.component.ts | 20 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index f3cbe3891a..267343da90 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -25,9 +25,9 @@ - + - + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index 1f238f364e..04c59c8ca2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -19,13 +19,12 @@ import { Component, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; - import {MatTableDataSource} from '@angular/material'; + import { MatTableDataSource } from '@angular/material'; + import { ProjectDataService } from '../project-data.service'; import { ProjectService } from '../../../core/services'; import { Project } from '../project.component'; - import { data } from './data'; - @Component({ selector: 'project-list', templateUrl: './project-list.component.html', @@ -33,12 +32,14 @@ }) export class ProjectListComponent implements OnInit { - displayedColumns: string[] = ['project_name', 'endpoint_name', 'project_tag', 'actions']; - dataSource: any; + displayedColumns: string[] = ['project_name', 'endpoints_list', 'project_tag', 'actions']; + dataSource: Project[] | any; constructor( public toastr: ToastrService, - private projectService: ProjectService) { } + private projectDataService: ProjectDataService, + private projectService: ProjectService + ) { } ngOnInit() { @@ -55,10 +56,7 @@ export class ProjectListComponent implements OnInit { private getProjectsList() { // Project[] type - this.dataSource = new MatTableDataSource(data.projects); - - this.projectService.getProjectsList().subscribe( - (response: any) => this.dataSource = response, - error => this.toastr.error(error.message || 'Receiving list failed!', 'Oops!')); + debugger; + this.dataSource = new MatTableDataSource(this.projectDataService.getProjects) } } From d8898c1ef76a3762094fee149550d4e905ea44b7 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 17:05:36 +0300 Subject: [PATCH 053/357] endpoint.service methods added --- .../app/core/services/applicationServiceFacade.service.ts | 7 +++++++ .../main/resources/webapp/src/app/core/services/index.ts | 1 + 2 files changed, 8 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index 5085056030..c9b176cfe6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -69,6 +69,7 @@ export class ApplicationServiceFacade { private static readonly DOWNLOAD_REPORT = 'download_report'; private static readonly SETTINGS = 'settings'; private static readonly PROJECT = 'project'; + private static readonly ENDPOINT = 'endpoint'; private accessTokenKey: string = 'access_token'; private requestRegistry: Dictionary; @@ -532,6 +533,11 @@ export class ApplicationServiceFacade { this.requestRegistry.Item(ApplicationServiceFacade.PROJECT), null); } + public buildGetEndpointsData(): Observable { + return this.buildRequest(RequestMethod.Get, + this.requestRegistry.Item(ApplicationServiceFacade.ENDPOINT), + null); + } private setupRegistry(): void { this.requestRegistry = new Dictionary(); @@ -608,6 +614,7 @@ export class ApplicationServiceFacade { // project this.requestRegistry.Add(ApplicationServiceFacade.PROJECT, '/api/project'); + this.requestRegistry.Add(ApplicationServiceFacade.ENDPOINT, '/api/endpoint'); } private buildRequest(method: RequestMethod, url: string, body: any, opt?) { diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts index 1bf598c2db..803fd9d8eb 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts @@ -36,3 +36,4 @@ export * from './rolesManagement.service'; export * from './dataengineConfiguration.service'; export * from './storage.service'; export * from './project.service'; +export * from './endpoint.service'; From 29a76a04645368aca5a4ea0458a1b3451c3b9da0 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 17:12:46 +0300 Subject: [PATCH 054/357] fixed dialogs styles; extended classes --- .../computational-resources-list.component.ts | 2 +- .../ami-create-dialog.component.html | 7 +++--- .../detail-dialog.component.html | 2 +- ...y-environment-create-dialog.component.html | 7 +++--- .../install-libraries.component.html | 10 ++++----- .../manage-ungit/manage-ungit.component.html | 7 +++--- .../resources-grid.component.ts | 10 ++++----- .../src/app/resources/resources.component.ts | 4 ++-- .../scheduler/scheduler.component.html | 7 +++--- .../shared/modal-dialog/modal.component.scss | 21 ++++++++++++++++++ .../webapp/src/assets/styles/_dialogs.scss | 22 +------------------ .../src/main/resources/webapp/src/styles.scss | 10 ++++----- 12 files changed, 57 insertions(+), 52 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts index 4004adf4b0..89e3992533 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts @@ -88,7 +88,7 @@ export class ComputationalResourcesListComponent { openScheduleDialog(resource) { // this.clusterScheduler.open({ isFooter: false }, this.environment, 'СOMPUTATIONAL', resource); - this.dialog.open(SchedulerComponent, { data: {notebook: this.environment, type: 'СOMPUTATIONAL', resource} }) + this.dialog.open(SchedulerComponent, { data: {notebook: this.environment, type: 'СOMPUTATIONAL', resource}, panelClass: 'modal-xl-s' }) .afterClosed().subscribe(() => this.rebuildGrid()); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html index 2fe3ecf526..e9474fe63d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html @@ -17,11 +17,12 @@ ~ under the License. --> -
-
+
+
+
-
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html index 4420236d82..1efa05a548 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html @@ -21,7 +21,7 @@
-
+
{{element.project_name}} Endpoint name {{element.endpoint_name}} {{element.endpoints_list}}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html index 20625dcda3..0e92d01dc1 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html @@ -17,11 +17,12 @@ ~ under the License. --> -
-
+
+
+
-
+
-
-
- +
+
+ +
-
+

Cannot install libraries: Exploratory diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html index a8a46dd3a5..4f94b88c70 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html @@ -17,11 +17,12 @@ ~ under the License. --> -

-
+
+
+
-
+
-
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss index 267fb3964d..6a6fc02b1b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss @@ -237,3 +237,24 @@ padding-left: 45px !important; } } + +.modal-content { + display: block; + position: relative; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid rgba(0,0,0,.2); + border-radius: 3px; + outline: 0; + -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); + box-shadow: 0 3px 9px rgba(0,0,0,.5); + .danger_color { + padding-left: 5px; + font-size: 12px; + display: inline-block; + font-family: 'Open Sans', sans-serif; + font-weight: 300; + border-color: #d9534f !important; + } +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index 6c3f9bb2ad..d27cd734e3 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -26,6 +26,7 @@ .modal-xl-s { width: 660px; } .modal-xl { width: 900px; } .modal-xxl { width: 1000px; } + .modal-fullscreen { width: 100vw; height: 100vh;} mat-dialog-container { &.mat-dialog-container { @@ -176,24 +177,3 @@ mat-dialog-container { .content-box { padding: 25px 30px 35px; } - -// .modal-content { -// display: block; -// position: relative; -// background-color: #fff; -// -webkit-background-clip: padding-box; -// background-clip: padding-box; -// border: 1px solid rgba(0,0,0,.2); -// border-radius: 3px; -// outline: 0; -// -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); -// box-shadow: 0 3px 9px rgba(0,0,0,.5); -// .danger_color { -// padding-left: 5px; -// font-size: 12px; -// display: inline-block; -// font-family: 'Open Sans', sans-serif; -// font-weight: 300; -// border-color: #d9534f !important; -// } -// } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 3650353200..58269fa77c 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -22,10 +22,10 @@ @import './assets/fonts/Material_Icons/material-icons.css'; @import './assets/fonts/Open_Sans/open-sans.css'; -@import './assets/styles/_reset.scss'; -@import './assets/styles/_general.scss'; -@import './assets/styles/_theme.scss'; -@import './assets/styles/_dialogs.scss'; +@import '_reset.scss'; +@import '_general.scss'; +@import '_theme.scss'; +@import '_dialogs.scss'; .mat-tab-label { font-family: 'Open Sans', sans-serif !important; @@ -136,7 +136,7 @@ mat-chip.mat-chip strong { text-align: center; } .info { - font-size: 16px; + font-size: 15px; font-weight: 300; color: #35afd5; } From 471218e1af56ffb84f7461ff5e8018e082cc877c Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 23 May 2019 17:49:48 +0300 Subject: [PATCH 055/357] fixed dialogs styles; extended classes --- .../cluster-details/cluster-details.component.html | 2 +- ...computational-resource-create-dialog.component.html | 10 ++++------ .../ami-create-dialog/ami-create-dialog.component.html | 4 ++-- .../detail-dialog/detail-dialog.component.html | 2 +- ...xploratory-environment-create-dialog.component.html | 4 ++-- .../install-libraries/install-libraries.component.html | 4 ++-- .../resources/manage-ungit/manage-ungit.component.html | 4 ++-- .../app/resources/scheduler/scheduler.component.html | 2 +- .../resources/webapp/src/assets/styles/_dialogs.scss | 2 +- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html index d341eb72fa..a1315875aa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index 704de73e20..0ffd41c26d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -17,11 +17,12 @@ ~ under the License. --> -
-
+
+

Add computational resources

+
-
+
Add computational resources
-
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html index e9474fe63d..cc817fead1 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html @@ -17,9 +17,9 @@ ~ under the License. --> -
+
- +

Create {{ DICTIONARY.image }}

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html index 1efa05a548..fce60ad95d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html index 0e92d01dc1..45ee4bf988 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html @@ -17,9 +17,9 @@ ~ under the License. --> -
+
- +

Create analytical tool

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html index a219233d58..b015ab88a3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html @@ -17,9 +17,9 @@ ~ under the License. --> -
+
- +

Manage {{ notebook?.name }} Libraries

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html index 4f94b88c70..cca7629238 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html @@ -17,9 +17,9 @@ ~ under the License. --> -
+
- +

Manage Git Credentials

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html index fc6c9b659c..e3e7c6b90f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
+

Scheduler for diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index d27cd734e3..9681eb6a66 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -32,7 +32,7 @@ mat-dialog-container { &.mat-dialog-container { padding: 0; border-radius: 0; - .dialog-box { + #dialog-box { color: $modal-text-color; .dialog-header { padding-left: 30px; From 4a0c343279cb49a440c458d8d911c648fede6db2 Mon Sep 17 00:00:00 2001 From: bhliva Date: Fri, 24 May 2019 16:47:15 +0300 Subject: [PATCH 056/357] DLAB-640 added possibility to set limits for project --- .../backendapi/SelfServiceApplication.java | 2 +- .../dlab/backendapi/annotation/Project.java | 12 +++++ .../dlab/backendapi/dao/BaseBillingDAO.java | 18 +++++++ .../com/epam/dlab/backendapi/dao/BaseDAO.java | 4 +- .../epam/dlab/backendapi/dao/BillingDAO.java | 4 ++ .../dlab/backendapi/dao/ExploratoryDAO.java | 30 +++++++++++ .../epam/dlab/backendapi/dao/ProjectDAO.java | 7 +++ .../dlab/backendapi/dao/ProjectDAOImpl.java | 16 ++++++ .../backendapi/dao/gcp/GcpBillingDao.java | 10 ++++ .../dlab/backendapi/domain/EndpointDTO.java | 2 + .../dlab/backendapi/domain/ProjectDTO.java | 7 ++- .../domain/UpdateProjectBudgetDTO.java | 13 +++++ .../interceptor/BudgetLimitInterceptor.java | 17 +++++- .../resources/EndpointResource.java | 4 +- .../resources/ExploratoryResource.java | 4 +- .../backendapi/resources/ProjectResource.java | 35 +++++++++++++ .../CheckProjectQuoteScheduler.java | 52 +++++++++++++++++++ .../service/ComputationalService.java | 6 +-- .../service/EnvironmentService.java | 2 + .../service/ExploratoryService.java | 4 +- .../backendapi/service/ProjectService.java | 6 +++ .../impl/ComputationalServiceImpl.java | 8 +-- .../service/impl/EnvironmentServiceImpl.java | 29 +++++++++++ .../service/impl/ExploratoryServiceImpl.java | 5 +- .../service/impl/ProjectServiceImpl.java | 17 +++++- .../service/impl/SchedulerJobServiceImpl.java | 4 +- .../resources/ExploratoryResourceTest.java | 14 ++--- .../impl/ComputationalServiceImplTest.java | 20 +++---- .../impl/ExploratoryServiceImplTest.java | 12 ++--- .../impl/SchedulerJobServiceImplTest.java | 12 ++--- 30 files changed, 325 insertions(+), 51 deletions(-) create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Project.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectBudgetDTO.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/schedulers/CheckProjectQuoteScheduler.java diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java index 508b34fe85..8271fb2a37 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java @@ -192,7 +192,7 @@ public void run(SelfServiceApplicationConfiguration configuration, Environment e oas.info(info); SwaggerConfiguration oasConfig = new SwaggerConfiguration() .openAPI(oas) - .readAllResources(false) + //.readAllResources(false) .prettyPrint(true) .resourceClasses(Stream.of(ProjectResource.class.getName(), EndpointResource.class.getName()) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Project.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Project.java new file mode 100644 index 0000000000..5a1e5d42e7 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Project.java @@ -0,0 +1,12 @@ +package com.epam.dlab.backendapi.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +public @interface Project { +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java index 29319c78f2..23785b4ee0 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java @@ -58,6 +58,7 @@ public abstract class BaseBillingDAO extends BaseDAO im public static final String COST_TOTAL = "cost_total"; public static final String FULL_REPORT = "full_report"; + private static final String PROJECT = "project"; private static final String MASTER_NODE_SHAPE = "master_node_shape"; private static final String SLAVE_NODE_SHAPE = "slave_node_shape"; private static final String TOTAL_INSTANCE_NUMBER = "total_instance_number"; @@ -75,6 +76,8 @@ public abstract class BaseBillingDAO extends BaseDAO im protected SettingsDAO settings; @Inject private UserSettingsDAO userSettingsDAO; + @Inject + private ProjectDAO projectDAO; protected Map getShapes(List shapeNames) { FindIterable userInstances = getUserInstances(); @@ -108,6 +111,13 @@ public Double getUserCost(String user) { return aggregateBillingData(pipeline); } + @Override + public Double getProjectCost(String project) { + final List pipeline = Arrays.asList(match(eq(PROJECT, project)), + group(null, sum(TOTAL_FIELD_NAME, COST_FIELD))); + return aggregateBillingData(pipeline); + } + @Override public int getBillingQuoteUsed() { return toPercentage(() -> settings.getMaxBudget(), getTotalCost()); @@ -131,6 +141,14 @@ public boolean isUserQuoteReached(String user) { .isPresent(); } + @Override + public boolean isProjectQuoteReached(String project) { + final Double projectCost = getProjectCost(project); + return projectDAO.getAllowedBudget(project) + .filter(allowedBudget -> projectCost.intValue() != 0 && allowedBudget <= projectCost) + .isPresent(); + } + protected String getUserOrDefault(String user) { return StringUtils.isNotBlank(user) ? user : SHARED_RESOURCE_NAME; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseDAO.java index 77f3284117..034011a0a8 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseDAO.java @@ -371,7 +371,7 @@ Document convertToBson(Object object) { */ protected Optional findOne(String collection, Bson condition, Class clazz) { Optional doc = findOne(collection, condition); - return doc.isPresent() ? Optional.ofNullable(convertFromDocument(doc.get(), clazz)) : Optional.empty(); + return doc.map(document -> convertFromDocument(document, clazz)); } /** @@ -384,7 +384,7 @@ protected Optional findOne(String collection, Bson condition, Class cl */ protected Optional findOne(String collection, Bson condition, Bson projection, Class clazz) { Optional doc = findOne(collection, condition, projection); - return doc.isPresent() ? Optional.ofNullable(convertFromDocument(doc.get(), clazz)) : Optional.empty(); + return doc.map(document -> convertFromDocument(document, clazz)); } /** diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BillingDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BillingDAO.java index 079c7ea5bc..1498012191 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BillingDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BillingDAO.java @@ -27,6 +27,8 @@ public interface BillingDAO { Double getUserCost(String user); + Double getProjectCost(String project); + int getBillingQuoteUsed(); int getBillingUserQuoteUsed(String user); @@ -35,5 +37,7 @@ public interface BillingDAO { boolean isUserQuoteReached(String user); + boolean isProjectQuoteReached(String project); + Document getReport(UserInfo userInfo, T filter); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java index ea3cef0c34..499ca20359 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java @@ -67,6 +67,7 @@ public class ExploratoryDAO extends BaseDAO { private static final String EXPLORATORY_PRIVATE_IP = "private_ip"; public static final String EXPLORATORY_NOT_FOUND_MSG = "Exploratory for user %s with name %s not found"; private static final String EXPLORATORY_LAST_ACTIVITY = "last_activity"; + private static final String PROJECT = "project"; public ExploratoryDAO() { log.info("{} is initialized", getClass().getSimpleName()); @@ -129,6 +130,10 @@ public List fetchRunningExploratoryFields(String user) { return getUserInstances(and(eq(USER, user), eq(STATUS, UserInstanceStatus.RUNNING.toString())), false); } + public List fetchRunningExploratoryFieldsForProject(String project) { + return getUserInstances(and(eq(PROJECT, project), eq(STATUS, UserInstanceStatus.RUNNING.toString())), false); + } + /** * Finds and returns the info of all user's notebooks whose status is present among predefined ones. * @@ -169,6 +174,20 @@ public List fetchUserExploratoriesWhereStatusIn(String user, false); } + public List fetchProjectExploratoriesWhereStatusIn(String project, + List exploratoryStatuses, + UserInstanceStatus... computationalStatuses) { + final List exploratoryStatusList = statusList(exploratoryStatuses); + final List computationalStatusList = statusList(computationalStatuses); + return getUserInstances( + and( + eq(PROJECT, project), + or(in(STATUS, exploratoryStatusList), + in(COMPUTATIONAL_RESOURCES + "." + STATUS, computationalStatusList)) + ), + false); + } + /** * Finds and returns the info of all user's notebooks whose status is absent among predefined ones. * @@ -185,6 +204,17 @@ public List fetchUserExploratoriesWhereStatusNotIn(String user, false); } + public List fetchProjectExploratoriesWhereStatusNotIn(String project, + UserInstanceStatus... statuses) { + final List statusList = statusList(statuses); + return getUserInstances( + and( + eq(USER, project), + not(in(STATUS, statusList)) + ), + false); + } + private List getUserInstances(Bson condition, boolean computationalFieldsRequired) { return stream(getCollection(USER_INSTANCES) .find(condition) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index a8e18eab86..26f49208b7 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -2,9 +2,12 @@ import com.epam.dlab.backendapi.domain.ProjectDTO; +import java.util.List; import java.util.Optional; public interface ProjectDAO { + List getProjects(); + void create(ProjectDTO projectDTO); Optional get(String name); @@ -12,4 +15,8 @@ public interface ProjectDAO { boolean update(ProjectDTO projectDTO); void remove(String name); + + Optional getAllowedBudget(String project); + + void updateBudget(String project, Integer budget); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index 0f6c6e7b05..5c0b9e9852 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -4,6 +4,7 @@ import org.bson.Document; import org.bson.conversions.Bson; +import java.util.List; import java.util.Optional; import static com.mongodb.client.model.Filters.eq; @@ -12,6 +13,11 @@ public class ProjectDAOImpl extends BaseDAO implements ProjectDAO { private static final String PROJECTS_COLLECTION = "Projects"; + @Override + public List getProjects() { + return find(PROJECTS_COLLECTION, ProjectDTO.class); + } + @Override public void create(ProjectDTO projectDTO) { insertOne(PROJECTS_COLLECTION, projectDTO); @@ -33,6 +39,16 @@ public void remove(String name) { } + @Override + public Optional getAllowedBudget(String project) { + return get(project).map(ProjectDTO::getBudget); + } + + @Override + public void updateBudget(String project, Integer budget) { + updateOne(PROJECTS_COLLECTION, projectCondition(project), new Document(SET, new Document("budget", budget))); + } + private Bson projectCondition(String name) { return eq("name", name); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java index 492d8b5c35..05112a2e59 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java @@ -35,6 +35,11 @@ public Double getUserCost(String user) { return null; } + @Override + public Double getProjectCost(String project) { + return null; + } + @Override public int getBillingQuoteUsed() { return 0; @@ -55,6 +60,11 @@ public boolean isUserQuoteReached(String user) { return false; } + @Override + public boolean isProjectQuoteReached(String project) { + return false; + } + @Override public Document getReport(UserInfo userInfo, BillingFilter filter) { return null; diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java index 4e14f08312..e3c467cde8 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java @@ -1,8 +1,10 @@ package com.epam.dlab.backendapi.domain; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class EndpointDTO { private final String name; diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 2799a2efed..2eb6a05b05 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -3,12 +3,17 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; +import javax.validation.constraints.NotNull; import java.util.Set; @Data @JsonIgnoreProperties(ignoreUnknown = true) public class ProjectDTO { + @NotNull private final String name; - private final Set endpoints; + @NotNull + private final Setendpoints; + @NotNull private final Set groups; + private final Integer budget; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectBudgetDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectBudgetDTO.java new file mode 100644 index 0000000000..72cbf05c38 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectBudgetDTO.java @@ -0,0 +1,13 @@ +package com.epam.dlab.backendapi.domain; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class UpdateProjectBudgetDTO { + @NotNull + private final String project; + @NotNull + private final Integer budget; +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/BudgetLimitInterceptor.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/BudgetLimitInterceptor.java index ebe3a54f31..43fdaf6f7c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/BudgetLimitInterceptor.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/BudgetLimitInterceptor.java @@ -20,6 +20,7 @@ package com.epam.dlab.backendapi.interceptor; import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.annotation.Project; import com.epam.dlab.backendapi.dao.BillingDAO; import com.epam.dlab.exceptions.ResourceQuoteReachedException; import com.google.inject.Inject; @@ -28,7 +29,10 @@ import org.aopalliance.intercept.MethodInvocation; import java.lang.reflect.Method; +import java.lang.reflect.Parameter; import java.util.Arrays; +import java.util.Objects; +import java.util.stream.IntStream; @Slf4j public class BudgetLimitInterceptor implements MethodInterceptor { @@ -37,7 +41,7 @@ public class BudgetLimitInterceptor implements MethodInterceptor { @Override public Object invoke(MethodInvocation mi) throws Throwable { - if (userQuoteReached(mi) || billingDAO.isBillingQuoteReached()) { + if (projectQuoteReached(mi) || billingDAO.isBillingQuoteReached()) { final Method method = mi.getMethod(); log.warn("Execution of method {} failed because of reaching resource limit quote", method.getName()); throw new ResourceQuoteReachedException("Operation can not be finished. Resource quote is reached"); @@ -54,4 +58,15 @@ private Boolean userQuoteReached(MethodInvocation mi) { .map(billingDAO::isUserQuoteReached) .orElse(Boolean.FALSE); } + + private Boolean projectQuoteReached(MethodInvocation mi) { + + final Parameter[] parameters = mi.getMethod().getParameters(); + return IntStream.range(0, parameters.length) + .filter(i -> Objects.nonNull(parameters[i].getAnnotation(Project.class))) + .mapToObj(i -> (String) mi.getArguments()[i]) + .findAny() + .map(billingDAO::isProjectQuoteReached) + .orElse(Boolean.FALSE); + } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EndpointResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EndpointResource.java index af3426eda6..0a12c4eaaa 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EndpointResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/EndpointResource.java @@ -70,11 +70,11 @@ public Response createEndpoint(@Parameter(hidden = true) @Auth UserInfo userInfo }) @GET @Path("{name}") + @Produces(MediaType.APPLICATION_JSON) public Response getEndpoint(@Parameter(hidden = true) @Auth UserInfo userInfo, @Parameter(description = "Endpoint name") @PathParam("name") String name) { - endpointService.get(name); - return Response.ok().build(); + return Response.ok(endpointService.get(name)).build(); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java index 897255dfd3..6e951c6918 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java @@ -83,7 +83,7 @@ public Response create(@ApiParam(hidden = true) @Auth UserInfo userInfo, log.warn("Unauthorized attempt to create a {} by user {}", formDTO.getImage(), userInfo.getName()); throw new DlabException("You do not have the privileges to create a " + formDTO.getTemplateName()); } - String uuid = exploratoryService.create(userInfo, getExploratory(formDTO)); + String uuid = exploratoryService.create(userInfo, getExploratory(formDTO), ""); return Response.ok(uuid).build(); } @@ -104,7 +104,7 @@ public String start(@ApiParam(hidden = true) @Auth UserInfo userInfo, @Valid @NotNull ExploratoryActionFormDTO formDTO) { log.debug("Starting exploratory environment {} for user {}", formDTO.getNotebookInstanceName(), userInfo.getName()); - return exploratoryService.start(userInfo, formDTO.getNotebookInstanceName()); + return exploratoryService.start(userInfo, formDTO.getNotebookInstanceName(), ""); } /** diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java index 4346601287..85029ddd93 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -2,6 +2,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.domain.UpdateProjectBudgetDTO; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.rest.dto.ErrorDTO; import com.google.inject.Inject; @@ -80,6 +81,22 @@ public Response getProject(@Parameter(hidden = true) @Auth UserInfo userInfo, .build(); } + @Operation(summary = "Get available projects", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Return information about projects", + content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = + @Schema(implementation = ProjectDTO.class))), + }) + @GET + @Produces(MediaType.APPLICATION_JSON) + public Response getProjects(@Parameter(hidden = true) @Auth UserInfo userInfo, + @Parameter(description = "Project name") + @PathParam("name") String name) { + return Response + .ok(projectService.getProjects()) + .build(); + } + @Operation(summary = "Update project", tags = "project") @ApiResponses({ @ApiResponse(responseCode = "200", description = "Project is successfully updated"), @@ -112,4 +129,22 @@ public Response removeProject( projectService.remove(name); return Response.ok().build(); } + + @Operation(summary = "Updates project budget", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Project budget is successfully updated"), + @ApiResponse(responseCode = "404", description = "Project with specified name not found"), + @ApiResponse(responseCode = "400", description = "Validation error", + content = @Content(mediaType = MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @PUT + @Path("/budget") + public Response updateBudget( + @Parameter(hidden = true) @Auth UserInfo userInfo, + @Parameter(description = "Project name") + UpdateProjectBudgetDTO dto) { + projectService.updateBudget(dto.getProject(), dto.getBudget()); + return Response.ok().build(); + } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/schedulers/CheckProjectQuoteScheduler.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/schedulers/CheckProjectQuoteScheduler.java new file mode 100644 index 0000000000..f253145bfe --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/schedulers/CheckProjectQuoteScheduler.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package com.epam.dlab.backendapi.schedulers; + +import com.epam.dlab.backendapi.dao.BillingDAO; +import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.schedulers.internal.Scheduled; +import com.epam.dlab.backendapi.service.EnvironmentService; +import com.epam.dlab.backendapi.service.ProjectService; +import com.google.inject.Inject; +import lombok.extern.slf4j.Slf4j; +import org.quartz.Job; +import org.quartz.JobExecutionContext; + +@Scheduled("checkProjectQuoteScheduler") +@Slf4j +public class CheckProjectQuoteScheduler implements Job { + + @Inject + private BillingDAO billingDAO; + @Inject + private EnvironmentService environmentService; + @Inject + private ProjectService projectService; + + @Override + public void execute(JobExecutionContext context) { + projectService.getProjects() + .stream() + .map(ProjectDTO::getName) + .filter(billingDAO::isProjectQuoteReached) + .peek(p -> log.warn("Stopping {} project env because of reaching user billing quote", p)) + .forEach(environmentService::stopProjectEnvironment); + } +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ComputationalService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ComputationalService.java index 1be1be563d..217e18ee1c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ComputationalService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ComputationalService.java @@ -40,7 +40,7 @@ public interface ComputationalService { * name already exists * @throws IllegalArgumentException if input parameters exceed limits or docker image name is malformed */ - boolean createSparkCluster(UserInfo userInfo, SparkStandaloneClusterCreateForm form); + boolean createSparkCluster(UserInfo userInfo, SparkStandaloneClusterCreateForm form, String project); /** * Asynchronously triggers termination of computational resources @@ -53,11 +53,11 @@ public interface ComputationalService { void terminateComputational(UserInfo userInfo, String exploratoryName, String computationalName); boolean createDataEngineService(UserInfo userInfo, ComputationalCreateFormDTO formDTO, UserComputationalResource - computationalResource); + computationalResource, String project); void stopSparkCluster(UserInfo userInfo, String exploratoryName, String computationalName); - void startSparkCluster(UserInfo userInfo, String exploratoryName, String computationalName); + void startSparkCluster(UserInfo userInfo, String exploratoryName, String computationalName, String project); void updateSparkClusterConfig(UserInfo userInfo, String exploratoryName, String computationalName, List config); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java index cb9371d915..230e50eebf 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EnvironmentService.java @@ -36,6 +36,7 @@ public interface EnvironmentService { void stopAll(); void stopEnvironment(String user); + void stopProjectEnvironment(String project); void stopEdge(String user); @@ -46,6 +47,7 @@ public interface EnvironmentService { void terminateAll(); void terminateEnvironment(String user); + void terminateProjectEnvironment(String project); void terminateExploratory(String user, String exploratoryName); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java index be83ca7ea9..e3729aa3ad 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java @@ -31,13 +31,13 @@ public interface ExploratoryService { - String start(UserInfo userInfo, String exploratoryName); + String start(UserInfo userInfo, String exploratoryName, String project); String stop(UserInfo userInfo, String exploratoryName); String terminate(UserInfo userInfo, String exploratoryName); - String create(UserInfo userInfo, Exploratory exploratory); + String create(UserInfo userInfo, Exploratory exploratory, String project); void updateExploratoryStatuses(String user, UserInstanceStatus status); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index 9619f87447..2e221e15ed 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -2,7 +2,11 @@ import com.epam.dlab.backendapi.domain.ProjectDTO; +import java.util.List; + public interface ProjectService { + List getProjects(); + void create(ProjectDTO projectDTO); ProjectDTO get(String name); @@ -10,4 +14,6 @@ public interface ProjectService { void remove(String name); void update(ProjectDTO projectDTO); + + void updateBudget(String project, Integer budget); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java index 70f68f462f..cc4ae0ae0f 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java @@ -22,6 +22,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.annotation.BudgetLimited; +import com.epam.dlab.backendapi.annotation.Project; import com.epam.dlab.backendapi.dao.ComputationalDAO; import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.domain.RequestId; @@ -90,7 +91,8 @@ public class ComputationalServiceImpl implements ComputationalService { @BudgetLimited @Override - public boolean createSparkCluster(UserInfo userInfo, SparkStandaloneClusterCreateForm form) { + public boolean createSparkCluster(UserInfo userInfo, SparkStandaloneClusterCreateForm form, + @Project String project) { if (computationalDAO.addComputational(userInfo.getName(), form.getNotebookName(), createInitialComputationalResource(form))) { @@ -153,7 +155,7 @@ public void terminateComputational(UserInfo userInfo, String exploratoryName, St @BudgetLimited @Override public boolean createDataEngineService(UserInfo userInfo, ComputationalCreateFormDTO formDTO, - UserComputationalResource computationalResource) { + UserComputationalResource computationalResource, @Project String project) { boolean isAdded = computationalDAO.addComputational(userInfo.getName(), formDTO.getNotebookName(), computationalResource); @@ -202,7 +204,7 @@ public void stopSparkCluster(UserInfo userInfo, String expName, String compName) @BudgetLimited @Override - public void startSparkCluster(UserInfo userInfo, String expName, String compName) { + public void startSparkCluster(UserInfo userInfo, String expName, String compName, @Project String project) { final UserInstanceDTO userInstance = exploratoryDAO.fetchExploratoryFields(userInfo.getName(), expName, true); final UserInstanceStatus requiredStatus = UserInstanceStatus.STOPPED; diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java index ade44fb225..217d139893 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java @@ -118,6 +118,14 @@ public void stopEnvironment(String user) { stopEdge(user); } + @Override + public void stopProjectEnvironment(String project) { + log.debug("Stopping environment for project {}", project); + checkProjectResourceConditions(project, "stop"); + exploratoryDAO.fetchRunningExploratoryFieldsForProject(project) + .forEach(this::stopNotebook); + } + @Override public void stopEdge(String user) { if (UserInstanceStatus.RUNNING.toString().equals(keyDAO.getEdgeStatus(user))) { @@ -152,6 +160,15 @@ public void terminateEnvironment(String user) { } } + @Override + public void terminateProjectEnvironment(String project) { + log.debug("Terminating environment for project {}", project); + checkProjectResourceConditions(project, "terminate"); + exploratoryDAO.fetchProjectExploratoriesWhereStatusNotIn(project, UserInstanceStatus.TERMINATED, + UserInstanceStatus.FAILED, UserInstanceStatus.TERMINATING) + .forEach(this::terminateNotebook); + } + @Override public void terminateExploratory(String user, String exploratoryName) { terminateNotebook(new UserInstanceDTO().withUser(user).withExploratoryName(exploratoryName)); @@ -227,4 +244,16 @@ private UserResourceInfo toUserResourceInfo(UserInstanceDTO userInstance) { .withCompResources(userInstance.getResources()) .withUser(userInstance.getUser()); } + + private void checkProjectResourceConditions(String project, String action) { + final List userInstances = exploratoryDAO + .fetchProjectExploratoriesWhereStatusIn(project, + Arrays.asList(UserInstanceStatus.CREATING, UserInstanceStatus.STARTING, + UserInstanceStatus.CREATING_IMAGE), + UserInstanceStatus.CREATING, UserInstanceStatus.STARTING, UserInstanceStatus.CREATING_IMAGE); + if (!userInstances.isEmpty()) { + log.error(String.format(ERROR_MSG_FORMAT, action)); + throw new ResourceConflictException(String.format(ERROR_MSG_FORMAT, action)); + } + } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java index 58f4aa5435..bdfa15509f 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java @@ -21,6 +21,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.annotation.BudgetLimited; +import com.epam.dlab.backendapi.annotation.Project; import com.epam.dlab.backendapi.dao.ComputationalDAO; import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.dao.GitCredsDAO; @@ -75,7 +76,7 @@ public class ExploratoryServiceImpl implements ExploratoryService { @BudgetLimited @Override - public String start(UserInfo userInfo, String exploratoryName) { + public String start(UserInfo userInfo, String exploratoryName, @Project String project) { return action(userInfo, exploratoryName, EXPLORATORY_START, STARTING); } @@ -91,7 +92,7 @@ public String terminate(UserInfo userInfo, String exploratoryName) { @BudgetLimited @Override - public String create(UserInfo userInfo, Exploratory exploratory) { + public String create(UserInfo userInfo, Exploratory exploratory, @Project String project) { boolean isAdded = false; try { exploratoryDAO.insertExploratory(getUserInstanceDTO(userInfo, exploratory)); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 523067473b..bceb5b9f99 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -2,20 +2,29 @@ import com.epam.dlab.backendapi.dao.ProjectDAO; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.service.EnvironmentService; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.exceptions.ResourceConflictException; import com.epam.dlab.exceptions.ResourceNotFoundException; import com.google.inject.Inject; +import java.util.List; import java.util.function.Supplier; public class ProjectServiceImpl implements ProjectService { private final ProjectDAO projectDAO; + private final EnvironmentService environmentService; @Inject - public ProjectServiceImpl(ProjectDAO projectDAO) { + public ProjectServiceImpl(ProjectDAO projectDAO, EnvironmentService environmentService) { this.projectDAO = projectDAO; + this.environmentService = environmentService; + } + + @Override + public List getProjects() { + return projectDAO.getProjects(); } @Override @@ -35,6 +44,7 @@ public ProjectDTO get(String name) { @Override public void remove(String name) { + environmentService.terminateProjectEnvironment(name); projectDAO.remove(name); } @@ -45,6 +55,11 @@ public void update(ProjectDTO projectDTO) { } } + @Override + public void updateBudget(String project, Integer budget) { + projectDAO.updateBudget(project, budget); + } + private Supplier projectNotFound() { return () -> new ResourceNotFoundException("Project with passed name not found"); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java index c906712208..ebe9bcd59b 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java @@ -243,7 +243,7 @@ private void startExploratory(SchedulerJobData schedulerJobData) { final String user = schedulerJobData.getUser(); final String exploratoryName = schedulerJobData.getExploratoryName(); log.debug("Starting exploratory {} for user {} by scheduler", exploratoryName, user); - exploratoryService.start(systemUserService.create(user), exploratoryName); + exploratoryService.start(systemUserService.create(user), exploratoryName, ""); if (schedulerJobData.getJobDTO().isSyncStartRequired()) { log.trace("Starting computational for exploratory {} for user {} by scheduler", exploratoryName, user); final DataEngineType sparkCluster = DataEngineType.SPARK_STANDALONE; @@ -266,7 +266,7 @@ private void terminateExploratory(SchedulerJobData job) { private void startSpark(String user, String expName, String compName) { log.debug("Starting exploratory {} computational {} for user {} by scheduler", expName, compName, user); - computationalService.startSparkCluster(systemUserService.create(user), expName, compName); + computationalService.startSparkCluster(systemUserService.create(user), expName, compName,""); } private boolean shouldClusterBeStarted(DataEngineType sparkCluster, UserComputationalResource compResource) { diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java index 2fa4c459a4..0266a8bac0 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java @@ -63,7 +63,7 @@ public void setup() throws AuthenticationException { @Test public void create() { - when(exploratoryService.create(any(UserInfo.class), any(Exploratory.class))).thenReturn("someUuid"); + when(exploratoryService.create(any(UserInfo.class), any(Exploratory.class), anyString())).thenReturn("someUuid"); final Response response = resources.getJerseyTest() .target("/infrastructure_provision/exploratory_environment") .request() @@ -74,14 +74,14 @@ public void create() { assertEquals("someUuid", response.readEntity(String.class)); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO())); + verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO()), ""); verifyNoMoreInteractions(exploratoryService); } @Test public void createWithFailedAuth() throws AuthenticationException { authFailSetup(); - when(exploratoryService.create(any(UserInfo.class), any(Exploratory.class))).thenReturn("someUuid"); + when(exploratoryService.create(any(UserInfo.class), any(Exploratory.class), anyString())).thenReturn("someUuid"); final Response response = resources.getJerseyTest() .target("/infrastructure_provision/exploratory_environment") .request() @@ -97,7 +97,7 @@ public void createWithFailedAuth() throws AuthenticationException { @Test public void createWithException() { doThrow(new DlabException("Could not create exploratory environment")) - .when(exploratoryService).create(any(UserInfo.class), any(Exploratory.class)); + .when(exploratoryService).create(any(UserInfo.class), any(Exploratory.class), anyString()); final Response response = resources.getJerseyTest() .target("/infrastructure_provision/exploratory_environment") .request() @@ -111,13 +111,13 @@ public void createWithException() { assertTrue(actualJson.contains(expectedJson)); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO())); + verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO()), anyString()); verifyNoMoreInteractions(exploratoryService); } @Test public void start() { - when(exploratoryService.start(any(UserInfo.class), anyString())).thenReturn("someUuid"); + when(exploratoryService.start(any(UserInfo.class), anyString(), anyString())).thenReturn("someUuid"); final Response response = resources.getJerseyTest() .target("/infrastructure_provision/exploratory_environment") .request() @@ -134,7 +134,7 @@ public void start() { @Test public void startWithFailedAuth() throws AuthenticationException { authFailSetup(); - when(exploratoryService.start(any(UserInfo.class), anyString())).thenReturn("someUuid"); + when(exploratoryService.start(any(UserInfo.class), anyString(), anyString())).thenReturn("someUuid"); final Response response = resources.getJerseyTest() .target("/infrastructure_provision/exploratory_environment") .request() diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java index 61118528a4..03e0c0bc47 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java @@ -130,7 +130,7 @@ public void createSparkCluster() { SparkStandaloneClusterCreateForm sparkClusterCreateForm = (SparkStandaloneClusterCreateForm) formList.get(0); boolean creationResult = - computationalService.createSparkCluster(userInfo, sparkClusterCreateForm); + computationalService.createSparkCluster(userInfo, sparkClusterCreateForm, ""); assertTrue(creationResult); verify(computationalDAO) @@ -153,7 +153,7 @@ public void createSparkClusterWhenResourceAlreadyExists() { any(SparkStandaloneClusterResource.class))).thenReturn(false); boolean creationResult = - computationalService.createSparkCluster(userInfo, (SparkStandaloneClusterCreateForm) formList.get(0)); + computationalService.createSparkCluster(userInfo, (SparkStandaloneClusterCreateForm) formList.get(0), ""); assertFalse(creationResult); verify(computationalDAO).addComputational(eq(USER), eq(EXPLORATORY_NAME), refEq(sparkClusterResource)); @@ -172,7 +172,7 @@ public void createSparkClusterWhenMethodFetchExploratoryFieldsThrowsException() SparkStandaloneClusterCreateForm sparkClusterCreateForm = (SparkStandaloneClusterCreateForm) formList.get(0); try { - computationalService.createSparkCluster(userInfo, sparkClusterCreateForm); + computationalService.createSparkCluster(userInfo, sparkClusterCreateForm,""); } catch (ResourceNotFoundException e) { assertEquals("Exploratory for user with name not found", e.getMessage()); } @@ -198,7 +198,7 @@ public void createSparkClusterWhenMethodNewComputationalCreateThrowsException() SparkStandaloneClusterCreateForm sparkClusterCreateForm = (SparkStandaloneClusterCreateForm) formList.get(0); try { - computationalService.createSparkCluster(userInfo, sparkClusterCreateForm); + computationalService.createSparkCluster(userInfo, sparkClusterCreateForm, ""); } catch (DlabException e) { assertEquals("Cannot create instance of resource class ", e.getMessage()); } @@ -347,7 +347,7 @@ public void createDataEngineService() { when(requestId.put(anyString(), anyString())).thenReturn(UUID); boolean creationResult = - computationalService.createDataEngineService(userInfo, formList.get(1), ucResource); + computationalService.createDataEngineService(userInfo, formList.get(1), ucResource, ""); assertTrue(creationResult); verify(computationalDAO).addComputational(eq(USER), eq(EXPLORATORY_NAME), refEq(ucResource)); @@ -369,7 +369,7 @@ public void createDataEngineServiceWhenComputationalResourceNotAdded() { when(computationalDAO.addComputational(anyString(), anyString(), any(UserComputationalResource.class))) .thenReturn(false); - boolean creationResult = computationalService.createDataEngineService(userInfo, formList.get(1), ucResource); + boolean creationResult = computationalService.createDataEngineService(userInfo, formList.get(1), ucResource, ""); assertFalse(creationResult); verify(computationalDAO).addComputational(eq(USER), eq(EXPLORATORY_NAME), refEq(ucResource)); @@ -387,7 +387,7 @@ public void createDataEngineServiceWhenMethodFetchExploratoryFieldsThrowsExcepti .thenReturn(mock(UpdateResult.class)); try { - computationalService.createDataEngineService(userInfo, formList.get(1), ucResource); + computationalService.createDataEngineService(userInfo, formList.get(1), ucResource, ""); } catch (DlabException e) { assertEquals("Could not send request for creation the computational resource compName: " + "Exploratory for user with name not found", e.getMessage()); @@ -417,7 +417,7 @@ public void createDataEngineServiceWhenMethodNewComputationalCreateThrowsExcepti ComputationalCreateFormDTO computationalCreateFormDTO = formList.get(1); try { - computationalService.createDataEngineService(userInfo, computationalCreateFormDTO, ucResource); + computationalService.createDataEngineService(userInfo, computationalCreateFormDTO, ucResource, ""); } catch (DlabException e) { assertEquals("Could not send request for creation the computational resource compName: " + "Cannot create instance of resource class ", e.getMessage()); @@ -485,7 +485,7 @@ public void startSparkCluster() { .thenReturn("someUuid"); when(requestId.put(anyString(), anyString())).thenReturn("someUuid"); - computationalService.startSparkCluster(userInfo, EXPLORATORY_NAME, COMP_NAME); + computationalService.startSparkCluster(userInfo, EXPLORATORY_NAME, COMP_NAME, ""); verify(computationalDAO).updateComputationalStatus(refEq(computationalStatusDTOWithStatusStarting, "self")); verify(exploratoryDAO).fetchExploratoryFields(USER, EXPLORATORY_NAME, true); @@ -507,7 +507,7 @@ public void startSparkClusterWhenDataengineStatusIsRunning() { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("There is no stopped dataengine compName for exploratory expName"); - computationalService.startSparkCluster(userInfo, EXPLORATORY_NAME, COMP_NAME); + computationalService.startSparkCluster(userInfo, EXPLORATORY_NAME, COMP_NAME, ""); } @Test diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java index 2c28539faf..a3d96826a7 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java @@ -109,7 +109,7 @@ public void start() { .thenReturn(UUID); when(requestId.put(anyString(), anyString())).thenReturn(UUID); - String uuid = exploratoryService.start(userInfo, EXPLORATORY_NAME); + String uuid = exploratoryService.start(userInfo, EXPLORATORY_NAME, ""); assertNotNull(uuid); assertEquals(UUID, uuid); @@ -128,7 +128,7 @@ public void startWhenMethodFetchExploratoryFieldsThrowsException() { doThrow(new ResourceNotFoundException("Exploratory for user with name not found")) .when(exploratoryDAO).fetchExploratoryFields(anyString(), anyString()); try { - exploratoryService.start(userInfo, EXPLORATORY_NAME); + exploratoryService.start(userInfo, EXPLORATORY_NAME, ""); } catch (DlabException e) { assertEquals("Could not exploratory/start exploratory environment expName: Exploratory for user with " + "name not found", e.getMessage()); @@ -260,7 +260,7 @@ public void create() { .thenReturn(UUID); when(requestId.put(anyString(), anyString())).thenReturn(UUID); - String uuid = exploratoryService.create(userInfo, exploratory); + String uuid = exploratoryService.create(userInfo, exploratory, ""); assertNotNull(uuid); assertEquals(UUID, uuid); @@ -283,7 +283,7 @@ public void createWhenMethodInsertExploratoryThrowsException() { "Exploratory for user with name not found"); Exploratory exploratory = Exploratory.builder().name(EXPLORATORY_NAME).build(); - exploratoryService.create(userInfo, exploratory); + exploratoryService.create(userInfo, exploratory, ""); } @Test @@ -291,7 +291,7 @@ public void createWhenMethodInsertExploratoryThrowsExceptionWithItsCatching() { doThrow(new RuntimeException()).when(exploratoryDAO).insertExploratory(any(UserInstanceDTO.class)); Exploratory exploratory = Exploratory.builder().name(EXPLORATORY_NAME).build(); try { - exploratoryService.create(userInfo, exploratory); + exploratoryService.create(userInfo, exploratory, ""); } catch (DlabException e) { assertEquals("Could not create exploratory environment expName for user test: null", e.getMessage()); @@ -316,7 +316,7 @@ public void createWhenMethodNewExploratoryCreateThrowsException() { when(exploratoryDAO.updateExploratoryStatus(any(StatusEnvBaseDTO.class))).thenReturn(mock(UpdateResult.class)); try { - exploratoryService.create(userInfo, exploratory); + exploratoryService.create(userInfo, exploratory, ""); } catch (DlabException e) { assertEquals("Could not create exploratory environment expName for user test: Cannot create instance " + "of resource class ", e.getMessage()); diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImplTest.java index 4ca2ca03c3..55bfcbc44e 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImplTest.java @@ -399,7 +399,7 @@ public void testStartComputationalByScheduler() { verify(schedulerJobDAO) .getComputationalSchedulerDataWithOneOfStatus(RUNNING, DataEngineType.SPARK_STANDALONE, STOPPED); verify(computationalService).startSparkCluster(refEq(getUserInfo()), eq(EXPLORATORY_NAME), - eq(COMPUTATIONAL_NAME)); + eq(COMPUTATIONAL_NAME), eq("")); verifyNoMoreInteractions(systemUserService, schedulerJobDAO, computationalService); } @@ -691,7 +691,7 @@ public void testStartExploratoryByScheduler() { verify(systemUserService).create(USER); verify(schedulerJobDAO).getExploratorySchedulerDataWithStatus(STOPPED); - verify(exploratoryService).start(refEq(getUserInfo()), eq(EXPLORATORY_NAME)); + verify(exploratoryService).start(refEq(getUserInfo()), eq(EXPLORATORY_NAME), eq("")); verifyNoMoreInteractions(systemUserService, schedulerJobDAO, exploratoryService); verifyZeroInteractions(computationalService, computationalDAO); } @@ -715,10 +715,10 @@ public void testStartExploratoryBySchedulerWithSyncComputationalStart() { verify(systemUserService, times(2)).create(USER); verify(schedulerJobDAO).getExploratorySchedulerDataWithStatus(STOPPED); - verify(exploratoryService).start(refEq(getUserInfo()), eq(EXPLORATORY_NAME)); + verify(exploratoryService).start(refEq(getUserInfo()), eq(EXPLORATORY_NAME), eq("")); verify(computationalDAO).findComputationalResourcesWithStatus(USER, EXPLORATORY_NAME, STOPPED); verify(computationalService).startSparkCluster(refEq(getUserInfo()), eq(EXPLORATORY_NAME), - eq(COMPUTATIONAL_NAME)); + eq(COMPUTATIONAL_NAME), eq("")); verifyNoMoreInteractions(systemUserService, schedulerJobDAO, exploratoryService, computationalService, computationalDAO); } @@ -742,7 +742,7 @@ public void testStartExploratoryBySchedulerWithSyncComputationalStartDataEngine( verify(systemUserService).create(USER); verify(schedulerJobDAO).getExploratorySchedulerDataWithStatus(STOPPED); - verify(exploratoryService).start(refEq(getUserInfo()), eq(EXPLORATORY_NAME)); + verify(exploratoryService).start(refEq(getUserInfo()), eq(EXPLORATORY_NAME), eq("")); verify(computationalDAO).findComputationalResourcesWithStatus(USER, EXPLORATORY_NAME, STOPPED); verifyNoMoreInteractions(systemUserService, schedulerJobDAO, exploratoryService, computationalDAO); verifyZeroInteractions(computationalService); @@ -767,7 +767,7 @@ public void testStartExploratoryBySchedulerWithSyncComputationalStartOnExplorato verify(systemUserService).create(USER); verify(schedulerJobDAO).getExploratorySchedulerDataWithStatus(STOPPED); - verify(exploratoryService).start(refEq(getUserInfo()), eq(EXPLORATORY_NAME)); + verify(exploratoryService).start(refEq(getUserInfo()), eq(EXPLORATORY_NAME), eq("")); verify(computationalDAO).findComputationalResourcesWithStatus(USER, EXPLORATORY_NAME, STOPPED); verifyNoMoreInteractions(systemUserService, schedulerJobDAO, exploratoryService, computationalDAO); verifyZeroInteractions(computationalService); From 40b2ab9729254570d1504319a9ad25b54c3dd76f Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 24 May 2019 16:52:26 +0300 Subject: [PATCH 057/357] project creation form fixes --- .../project-form/project-form.component.html | 72 +++++++++---------- .../project-form/project-form.component.scss | 6 ++ .../project-form/project-form.component.ts | 6 +- 3 files changed, 45 insertions(+), 39 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index a579ace0b9..098f41e368 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -24,48 +24,44 @@
-
- -
- -
-
- -
-
- - - - - playlist_add_check All - - - clear None - - - - {{ group }} - - - - +
+ +
+
- -
- -
- +
+
+ + + + + playlist_add_check All + + + clear None + + + + {{ group }} + + + + +
+
- + - + + + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 1baea705a2..f39e0a9791 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -17,7 +17,10 @@ * under the License. */ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, OnDestroy, Inject } from '@angular/core'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { Subscription } from 'rxjs'; + import { ProjectDataService } from './project-data.service'; export interface Project { @@ -32,15 +35,66 @@ export interface Project { templateUrl: './project.component.html', styleUrls: ['./project.component.scss'] }) -export class ProjectComponent implements OnInit { - projectsList: Project[] = []; - constructor(private projectDataService: ProjectDataService) { } +export class ProjectComponent implements OnInit, OnDestroy { + projects: Project[] = []; + private subscriptions: Subscription = new Subscription(); + + constructor( + public dialog: MatDialog, + private projectDataService: ProjectDataService + ) { } ngOnInit() { - this.projectsList = this.projectDataService.getProjects; + this.subscriptions.add(this.projectDataService._projects.subscribe( + value => this.projects = value)); + } + + ngOnDestroy() { + this.subscriptions.unsubscribe(); } createProject() { console.log('create'); + + if (this.projects.length) + this.dialog.open(EditProjectComponent, { data: { action: 'create', item: null }, panelClass: 'modal-xl-s' }) + .afterClosed().subscribe(() => { + console.log('Create project'); + }); + } + + public editProject($event) { + this.dialog.open(EditProjectComponent, { data: { action: 'edit', item: $event }, panelClass: 'modal-xl-s' }) + .afterClosed().subscribe(() => { + console.log('Update project'); + }); } } + +@Component({ + selector: 'edit-project', + template: ` +
+
+

+ Create new project + Edit {{ data.item.project_name }} +

+ +
+
+ +
+
+ `, + styles: [` + .content { color: #718ba6; padding: 0; font-size: 14px; font-weight: 400; margin: 0; overflow: hidden; } + .edit-form { height: 380px; } + `] +}) +export class EditProjectComponent { + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) { } +} \ No newline at end of file From c0eaf171c4b50cf549df7c7b04c67985d9d9ab88 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 24 May 2019 16:55:13 +0300 Subject: [PATCH 059/357] added data subscription on projects list --- .../administration/project/project-data.service.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts index 1bba48a8f2..0cfb3869e3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -18,22 +18,24 @@ */ import { Injectable } from '@angular/core'; +import { of as observableOf, Observable, BehaviorSubject } from 'rxjs'; import { ProjectService } from '../../core/services'; import { Project } from './project.component'; import { data } from './project-list/data'; + @Injectable() export class ProjectDataService { - dataSource: any; - // Project[]; + + _projects = new BehaviorSubject(null); constructor(private projectService: ProjectService) { this.getProjectsList(); } - get getProjects() { - return this.dataSource; + public getProjects() { + this._projects.asObservable(); } public updateProjects() { @@ -41,10 +43,10 @@ export class ProjectDataService { } private getProjectsList() { - this.dataSource = data.projects; + this._projects.next(data.projects); this.projectService.getProjectsList().subscribe( - (response: any) => this.dataSource = data.projects); + (response: any) => this._projects.next(response)); } } \ No newline at end of file From df00d5d1e7c37f7fe78eb506ca1f2f5e6076ea3e Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 24 May 2019 16:56:16 +0300 Subject: [PATCH 060/357] emit data on etit project action --- .../src/app/administration/project/index.ts | 5 ++-- .../project-list/project-list.component.scss | 18 +++++++++++-- .../project-list/project-list.component.ts | 26 +++++++++++-------- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts index 4dfc82f48f..1c086d01bf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts @@ -27,7 +27,7 @@ import { FormControlsModule } from '../../shared/form-controls'; import { ProjectFormComponent } from './project-form/project-form.component'; import { ProjectListComponent } from './project-list/project-list.component'; -import { ProjectComponent } from './project.component'; +import { ProjectComponent, EditProjectComponent } from './project.component'; import { ProjectDataService } from './project-data.service'; @NgModule({ @@ -38,7 +38,8 @@ import { ProjectDataService } from './project-data.service'; MaterialModule, FormControlsModule ], - declarations: [ProjectComponent, ProjectFormComponent, ProjectListComponent], + declarations: [ProjectComponent, EditProjectComponent, ProjectFormComponent, ProjectListComponent], + entryComponents: [EditProjectComponent], providers: [ProjectDataService], exports: [ProjectComponent] }) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss index fb706f5f7a..a41856fae9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -17,6 +17,20 @@ * under the License. */ - table { +table { width: 100%; - } \ No newline at end of file + .project-actions { + color: #607d8b; + span { + transition: all .5s ease-in-out; + cursor: pointer; + .mat-icon { + font-size: 18px; + padding-top: 5px; + } + &:hover { + color: darken(#607d8b, 10%); + } + } + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index 04c59c8ca2..9e028399e2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -17,9 +17,10 @@ * under the License. */ - import { Component, OnInit } from '@angular/core'; + import { Component, OnInit, Output, EventEmitter, OnDestroy } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; import { MatTableDataSource } from '@angular/material'; + import { Subscription } from 'rxjs'; import { ProjectDataService } from '../project-data.service'; import { ProjectService } from '../../../core/services'; @@ -30,10 +31,13 @@ templateUrl: './project-list.component.html', styleUrls: ['./project-list.component.scss'] }) -export class ProjectListComponent implements OnInit { +export class ProjectListComponent implements OnInit, OnDestroy { displayedColumns: string[] = ['project_name', 'endpoints_list', 'project_tag', 'actions']; dataSource: Project[] | any; + @Output() editItem: EventEmitter<{}> = new EventEmitter(); + + private subscriptions: Subscription = new Subscription(); constructor( public toastr: ToastrService, @@ -43,20 +47,20 @@ export class ProjectListComponent implements OnInit { ngOnInit() { - this.getProjectsList(); + this.subscriptions.add(this.projectDataService._projects.subscribe(value => { + this.dataSource = new MatTableDataSource(value); + })); } - public editProject(item: Project[]) { - debugger; + ngOnDestroy() { + this.subscriptions.unsubscribe(); + } + + public editProject(item: Project[]) {; + this.editItem.emit(item); } public deleteProject(item: Project[]) { debugger; } - - private getProjectsList() { - // Project[] type - debugger; - this.dataSource = new MatTableDataSource(this.projectDataService.getProjects) - } } From 118cfee26e4e67ede6236f0a3faca3c9624d174d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 24 May 2019 17:05:34 +0300 Subject: [PATCH 061/357] update data list after project creation --- .../project/project-form/project-form.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 583a634c45..3cb5a9ba59 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -22,6 +22,7 @@ import { ToastrService } from 'ngx-toastr'; import { ProjectService,RolesGroupsService, EndpointService } from '../../../core/services'; + import { ProjectDataService } from '../project-data.service'; import { Project } from '../project.component'; @Component({ @@ -41,6 +42,7 @@ export class ProjectFormComponent implements OnInit { public toastr: ToastrService, private _fb: FormBuilder, private projectService: ProjectService, + private projectDataService: ProjectDataService, private rolesService: RolesGroupsService, private endpointService: EndpointService ) { } @@ -58,6 +60,7 @@ export class ProjectFormComponent implements OnInit { this.projectService.createProject(data).subscribe(response => { response && this.toastr.success('Project created successfully!', 'Success!'); + this.projectDataService.updateProjects(); this.reset(); }, error => this.toastr.error(error.message || 'Project creation failed!', 'Oops!')); } From 7dea58f23e8f62fd8a3bd6b1b2e4f85a532a2690 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 24 May 2019 18:02:56 +0300 Subject: [PATCH 062/357] extend delete project from list --- .../project/project-list/project-list.component.ts | 7 +++---- .../app/administration/project/project.component.html | 2 +- .../src/app/administration/project/project.component.ts | 9 +++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index 9e028399e2..4f73aa6714 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -23,7 +23,6 @@ import { Subscription } from 'rxjs'; import { ProjectDataService } from '../project-data.service'; - import { ProjectService } from '../../../core/services'; import { Project } from '../project.component'; @Component({ @@ -36,13 +35,13 @@ export class ProjectListComponent implements OnInit, OnDestroy { displayedColumns: string[] = ['project_name', 'endpoints_list', 'project_tag', 'actions']; dataSource: Project[] | any; @Output() editItem: EventEmitter<{}> = new EventEmitter(); + @Output() deleteItem: EventEmitter<{}> = new EventEmitter(); private subscriptions: Subscription = new Subscription(); constructor( public toastr: ToastrService, - private projectDataService: ProjectDataService, - private projectService: ProjectService + private projectDataService: ProjectDataService ) { } @@ -61,6 +60,6 @@ export class ProjectListComponent implements OnInit, OnDestroy { } public deleteProject(item: Project[]) { - debugger; + this.deleteItem.emit(item); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 9a9f6fa12c..778dc173ea 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -32,5 +32,5 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index f39e0a9791..2d31681f16 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -22,6 +22,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { Subscription } from 'rxjs'; import { ProjectDataService } from './project-data.service'; +import { NotificationDialogComponent } from '../../shared/modal-dialog/notification-dialog'; export interface Project { project_name: string; @@ -69,6 +70,14 @@ export class ProjectComponent implements OnInit, OnDestroy { console.log('Update project'); }); } + + public deleteProject($event) { + $event.name = $event.project_name; + this.dialog.open(NotificationDialogComponent, { data: { type: 'confirmation', item: $event }, panelClass: 'modal-sm' }) + .afterClosed().subscribe(() => { + console.log('Delete project'); + }); + } } @Component({ From 78a6295b5520ab8985e0e67cbddf9d79870214b6 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 24 May 2019 18:05:14 +0300 Subject: [PATCH 063/357] extended notification dialog --- .../notification-dialog.component.ts | 58 ++++++++++++------- .../webapp/src/assets/styles/_dialogs.scss | 1 + 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts index dab2f1013a..a83ecad544 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts @@ -23,30 +23,41 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; @Component({ selector: 'notification-dialog', template: ` -
-

priority_highWarning

- close -
-
-
-
- Following notebook servers - - {{ item.exploratory_name }} - , - will be stopped and all computational resources will be stopped/terminated -
+
+
+

priority_highWarning

+ +
+
+
+
+ Following notebook servers + + {{ item.exploratory_name }} + , + will be stopped and all computational resources will be stopped/terminated +
-
-

- Computational resources - {{ item.computational_name }} on {{ item.exploratory_name }} - will be stopped -

+
+

+ Computational resources + {{ item.computational_name }} on {{ item.exploratory_name }} + will be stopped +

+
+ by a schedule in 15 minutes. +
+
+
+

{{ data.item.name }} will be decommissioned.

+

Do you want to proceed?

+ +
+ + +
- by a schedule in 15 minutes.
-
`, styles: [` @@ -63,5 +74,8 @@ export class NotificationDialogComponent { constructor( public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any - ) { } + ) { + console.log(data); + + } } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index 9681eb6a66..6ed2eb02ac 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -29,6 +29,7 @@ .modal-fullscreen { width: 100vw; height: 100vh;} mat-dialog-container { + overflow-x: hidden; &.mat-dialog-container { padding: 0; border-radius: 0; From 3ce0fb89ee3490e6f6f1ea8adad5dea327b3461d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 11:43:19 +0300 Subject: [PATCH 064/357] added empty list placeholder for selects --- .../project/project-form/project-form.component.html | 4 +++- .../project/project-form/project-form.component.scss | 9 ++++++++- .../main/resources/webapp/src/assets/styles/_theme.scss | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 098f41e368..94bccdb5ae 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -41,7 +41,7 @@
- + playlist_add_check All @@ -53,6 +53,7 @@ {{ group }} + Endpoints list is empty

-
-
+
+
Following notebook servers @@ -63,6 +63,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; styles: [` .content { color: #718ba6; padding: 20px 50px; font-size: 14px; font-weight: 400 } .info { color: #35afd5; } + .info .confirm-dialog { color: #607D8B; } header { display: flex; justify-content: space-between; color: #607D8B; } header h4 i { vertical-align: bottom; } header a i { font-size: 20px; } From aa09a0407704312fbb12036617b122af301a52bb Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 16:05:18 +0300 Subject: [PATCH 069/357] [DLAB-631]: added extra check if no project data --- .../project-list/project-list.component.ts | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index 4f73aa6714..daf82a7761 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -17,13 +17,13 @@ * under the License. */ - import { Component, OnInit, Output, EventEmitter, OnDestroy } from '@angular/core'; - import { ToastrService } from 'ngx-toastr'; - import { MatTableDataSource } from '@angular/material'; - import { Subscription } from 'rxjs'; +import { Component, OnInit, Output, EventEmitter, OnDestroy } from '@angular/core'; +import { ToastrService } from 'ngx-toastr'; +import { MatTableDataSource } from '@angular/material'; +import { Subscription } from 'rxjs'; - import { ProjectDataService } from '../project-data.service'; - import { Project } from '../project.component'; +import { ProjectDataService } from '../project-data.service'; +import { Project } from '../project.component'; @Component({ selector: 'project-list', @@ -32,8 +32,8 @@ }) export class ProjectListComponent implements OnInit, OnDestroy { - displayedColumns: string[] = ['project_name', 'endpoints_list', 'project_tag', 'actions']; - dataSource: Project[] | any; + displayedColumns: string[] = ['name', 'endpoints', 'groups', 'actions']; + dataSource: Project[] | any = []; @Output() editItem: EventEmitter<{}> = new EventEmitter(); @Output() deleteItem: EventEmitter<{}> = new EventEmitter(); @@ -42,12 +42,12 @@ export class ProjectListComponent implements OnInit, OnDestroy { constructor( public toastr: ToastrService, private projectDataService: ProjectDataService - ) { } + ) { } ngOnInit() { - this.subscriptions.add(this.projectDataService._projects.subscribe(value => { - this.dataSource = new MatTableDataSource(value); + this.subscriptions.add(this.projectDataService._projects.subscribe((value: Project[]) => { + if (value) this.dataSource = new MatTableDataSource(value); })); } @@ -55,10 +55,11 @@ export class ProjectListComponent implements OnInit, OnDestroy { this.subscriptions.unsubscribe(); } - public editProject(item: Project[]) {; + public editProject(item: Project[]) { + ; this.editItem.emit(item); } - + public deleteProject(item: Project[]) { this.deleteItem.emit(item); } From 96aff4bfd4b56a1cc395d614cedd21fc35f48572 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 16:06:22 +0300 Subject: [PATCH 070/357] [DLAB-631]: modified column rendering --- .../project-list/project-list.component.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 267343da90..42ebc72ccc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -20,19 +20,19 @@
- + - + - - - + + + - - - + + + From 140a9b967c74ccd68f14e348db637d012fe6c1b4 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 16:07:06 +0300 Subject: [PATCH 071/357] [DLAB-631]: added extra check if no project data exist; extend service --- .../project/project-data.service.ts | 5 ++++- .../project/project.component.html | 8 +++---- .../project/project.component.ts | 22 ++++++++++++++++--- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts index 1df5a18a97..dcc44cd8d5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -42,6 +42,9 @@ export class ProjectDataService { private getProjectsList() { this.projectService.getProjectsList().subscribe( - (response: Project[]) => this._projects.next(response)); + (response: Project[]) => { + debugger; + this._projects.next(response) + }); } } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 778dc173ea..cf686e0f77 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -27,10 +27,10 @@
- + - - - +
+ +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 2158fdf0e4..5b05af35bc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -17,11 +17,12 @@ * under the License. */ -import { Component, OnInit, OnDestroy, Inject } from '@angular/core'; +import { Component, OnInit, OnDestroy, Inject, ChangeDetectorRef } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { Subscription } from 'rxjs'; import { ProjectDataService } from './project-data.service'; +import { HealthStatusService, UserAccessKeyService } from '../../core/services'; import { NotificationDialogComponent } from '../../shared/modal-dialog/notification-dialog'; export interface Project { @@ -38,16 +39,26 @@ export interface Project { }) export class ProjectComponent implements OnInit, OnDestroy { projects: Project[] = []; + healthStatus: any; + private subscriptions: Subscription = new Subscription(); constructor( public dialog: MatDialog, - private projectDataService: ProjectDataService + private projectDataService: ProjectDataService, + private healthStatusService: HealthStatusService, + private ref: ChangeDetectorRef, ) { } ngOnInit() { + this.getEnvironmentHealthStatus(); this.subscriptions.add(this.projectDataService._projects.subscribe( - value => this.projects = value)); + (value: Project[]) => { + if (value) { + this.projects = value; + this.ref.detectChanges(); + } + })); } ngOnDestroy() { @@ -78,6 +89,11 @@ export class ProjectComponent implements OnInit, OnDestroy { console.log('Delete project'); }); } + + private getEnvironmentHealthStatus() { + this.healthStatusService.getEnvironmentHealthStatus() + .subscribe((result: any) => this.healthStatus = result); + } } @Component({ From 721a5c0aab097faf8fd67610454ae3faa26cc062 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 16:09:40 +0300 Subject: [PATCH 072/357] [DLAB-631]: modified backups --- .../backup-dilog/backup-dilog.component.html | 7 +++-- .../management/management.component.ts | 2 +- .../webapp/src/assets/styles/_theme.scss | 30 +++++++++---------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html index f1f00f3cff..63be3b76d7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html @@ -17,11 +17,12 @@ ~ under the License. --> -
-
+
+

Backup options

+
-
+
this.buildGrid()); } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 66953f5c5d..a298d0d249 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -175,8 +175,7 @@ height: 34px; } -.backup-dialog span.mat-slide-toggle-content, -.scheduler-dialog span.mat-slide-toggle-content { + span.mat-slide-toggle-content { // font: 100 16px/24px 'Open Sans', sans-serif; font-style: normal; font-weight: 100; @@ -188,28 +187,23 @@ .scheduler-dialog .mat-slide-toggle { width: 100%; } -.backup-dialog .mat-slide-toggle-label-before .mat-slide-toggle-label { +.backup-dialog mat-slide-toggle { + display: initial; +} +.backup-dialog .mat-slide-toggle-label { justify-content: space-between; } .scheduler-dialog .mat-slide-toggle-label-before .mat-slide-toggle-label { justify-content: flex-end; } -.backup-dialog - .mat-slide-toggle.mat-checked:not(.mat-disabled) - .mat-slide-toggle-thumb, -.scheduler-dialog - .mat-slide-toggle.mat-checked:not(.mat-disabled) - .mat-slide-toggle-thumb { +.mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-thumb, +.scheduler-dialog .mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-thumb { background-color: #36afd5; } -.backup-dialog - .mat-slide-toggle.mat-checked:not(.mat-disabled) - .mat-slide-toggle-bar, -.scheduler-dialog - .mat-slide-toggle.mat-checked:not(.mat-disabled) - .mat-slide-toggle-bar { +.mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-bar, +.scheduler-dialog .mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-bar { background-color: rgba(54, 175, 213, 0.3); } @@ -218,6 +212,9 @@ .mat-raised-button.mat-accent { background-color: #36afd5; } +.mat-slide-toggle.mat-checked .mat-ripple-element { + background-color: #36afd5; +} .mat-calendar-body-cell-content.mat-calendar-body-selected { background: #36afd5; @@ -231,7 +228,8 @@ white-space: pre-line !important; word-break: break-all; } -.manage-roles-dialog, .project-form { +.manage-roles-dialog, +.project-form { .mat-form-field { width: 100%; } From 8436d3fb5a47be06f3b8d131756293f8a95a7a58 Mon Sep 17 00:00:00 2001 From: bhliva Date: Mon, 27 May 2019 16:51:49 +0300 Subject: [PATCH 073/357] DLAB-000 remove project API implemented on DAO layer --- .../main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index 5c0b9e9852..478cebd1e4 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -36,7 +36,7 @@ public boolean update(ProjectDTO projectDTO) { @Override public void remove(String name) { - + deleteOne(PROJECTS_COLLECTION, projectCondition(name)); } @Override From 7557f4958c1837de5574a3c8db3c65e4f62000dd Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 16:52:08 +0300 Subject: [PATCH 074/357] [DLAB-631]: projects removing implementation added --- .../project/project-data.service.ts | 5 +---- .../project-form/project-form.component.ts | 1 - .../project/project.component.html | 6 +++++- .../administration/project/project.component.ts | 16 +++++++++++----- .../services/applicationServiceFacade.service.ts | 7 +++++++ .../src/app/core/services/project.service.ts | 9 +++++++++ 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts index dcc44cd8d5..1df5a18a97 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -42,9 +42,6 @@ export class ProjectDataService { private getProjectsList() { this.projectService.getProjectsList().subscribe( - (response: Project[]) => { - debugger; - this._projects.next(response) - }); + (response: Project[]) => this._projects.next(response)); } } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 75d9fc7034..a16292d531 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -75,7 +75,6 @@ export class ProjectFormComponent implements OnInit { } public selectOptions(list, key, select?) { - debugger; this.projectForm.controls[key].setValue(select ? list : []); } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index cf686e0f77..9e46186420 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -24,7 +24,11 @@ addCreate new
-
+
+ +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 5b05af35bc..5abeabc0ce 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -22,7 +22,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { Subscription } from 'rxjs'; import { ProjectDataService } from './project-data.service'; -import { HealthStatusService, UserAccessKeyService } from '../../core/services'; +import { HealthStatusService, ProjectService } from '../../core/services'; import { NotificationDialogComponent } from '../../shared/modal-dialog/notification-dialog'; export interface Project { @@ -45,6 +45,7 @@ export class ProjectComponent implements OnInit, OnDestroy { constructor( public dialog: MatDialog, + private projectService: ProjectService, private projectDataService: ProjectDataService, private healthStatusService: HealthStatusService, private ref: ChangeDetectorRef, @@ -65,6 +66,10 @@ export class ProjectComponent implements OnInit, OnDestroy { this.subscriptions.unsubscribe(); } + refreshGrid() { + this.projectDataService.updateProjects(); + } + createProject() { console.log('create'); @@ -83,10 +88,11 @@ export class ProjectComponent implements OnInit, OnDestroy { } public deleteProject($event) { - $event.name = $event.project_name; this.dialog.open(NotificationDialogComponent, { data: { type: 'confirmation', item: $event }, panelClass: 'modal-sm' }) - .afterClosed().subscribe(() => { - console.log('Delete project'); + .afterClosed().subscribe(result => { + this.projectService.deleteProject($event.name).subscribe(() => { + this.refreshGrid(); + }); }); } @@ -103,7 +109,7 @@ export class ProjectComponent implements OnInit, OnDestroy {

Create new project - Edit {{ data.item.project_name }} + Edit {{ data.item.name }}

diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index c9b176cfe6..9a93bb14f0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -533,6 +533,13 @@ export class ApplicationServiceFacade { this.requestRegistry.Item(ApplicationServiceFacade.PROJECT), null); } + + public buildDeleteProject(param): Observable { + return this.buildRequest(RequestMethod.Delete, + this.requestRegistry.Item(ApplicationServiceFacade.PROJECT) + param, + null); + } + public buildGetEndpointsData(): Observable { return this.buildRequest(RequestMethod.Get, this.requestRegistry.Item(ApplicationServiceFacade.ENDPOINT), diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts index 2f33dcc703..f9d72b7ea4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts @@ -43,4 +43,13 @@ export class ProjectService { map(response => response), catchError(ErrorUtils.handleServiceError)); } + + public deleteProject(data): Observable<{}> { + const url = `/${data}`; + return this.applicationServiceFacade + .buildDeleteProject(url) + .pipe( + map(response => response), + catchError(ErrorUtils.handleServiceError)); + } } \ No newline at end of file From df259aefae5777f3a1cb93850f4f541974969a08 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 17:54:20 +0300 Subject: [PATCH 075/357] [DLAB-631]: moved general styles --- .../webapp/src/app/resources/resources.component.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.scss index e718a6b378..e4a13aeb35 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.scss @@ -22,14 +22,6 @@ } .butt { - &.butt-create { - color: #35afd5; - } - &.butt-create { - &:disabled{ - color: #577289!important; - } - } &.butt-tool { margin-right: 10px; } From 6763e6144521efb8824d414e8fce7a96ba23a333 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 17:55:17 +0300 Subject: [PATCH 076/357] [DLAB-635]: added update service methods --- .../app/core/services/applicationServiceFacade.service.ts | 7 +++++++ .../webapp/src/app/core/services/project.service.ts | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index 9a93bb14f0..ad1734b3ec 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -528,6 +528,13 @@ export class ApplicationServiceFacade { this.requestRegistry.Item(ApplicationServiceFacade.PROJECT), data); } + + public buildUpdateProject(data): Observable { + return this.buildRequest(RequestMethod.Put, + this.requestRegistry.Item(ApplicationServiceFacade.PROJECT), + data); + } + public buildGetProjectsList(): Observable { return this.buildRequest(RequestMethod.Get, this.requestRegistry.Item(ApplicationServiceFacade.PROJECT), diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts index f9d72b7ea4..ff1736502d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts @@ -35,6 +35,14 @@ export class ProjectService { map(response => response), catchError(ErrorUtils.handleServiceError)); } + + public updateProject(data): Observable<{}> { + return this.applicationServiceFacade + .buildUpdateProject(data) + .pipe( + map(response => response), + catchError(ErrorUtils.handleServiceError)); + } public getProjectsList(): Observable<{}> { return this.applicationServiceFacade From 30673f07453c63bb488efaaa4cbaa4facb24680c Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 17:56:21 +0300 Subject: [PATCH 077/357] [DLAB-635]: modify confirm action; update projects --- .../project-form/project-form.component.html | 4 ++- .../project-form/project-form.component.ts | 25 ++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index cef71f26ac..0ed97e19d6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -104,7 +104,9 @@ + (click)="confirm(projectForm.value)"> + UpdateCreate +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index a16292d531..996d3acc07 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -17,7 +17,7 @@ * under the License. */ - import { Component, OnInit, Input } from '@angular/core'; + import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; @@ -37,6 +37,7 @@ export class ProjectFormComponent implements OnInit { public endpointsList: any = []; @Input() item: any; + @Output() update: EventEmitter<{}> = new EventEmitter(); constructor( public toastr: ToastrService, @@ -55,14 +56,20 @@ export class ProjectFormComponent implements OnInit { this.item && this.editSpecificProject(this.item); } - public createProject(data) { - console.log(data); - - this.projectService.createProject(data).subscribe(response => { - response && this.toastr.success('Project created successfully!', 'Success!'); - this.projectDataService.updateProjects(); - this.reset(); - }, error => this.toastr.error(error.message || 'Project creation failed!', 'Oops!')); + public confirm(data) { + if (this.item) { + this.projectService.updateProject(data).subscribe(() => { + this.toastr.success('Project creupdatedated successfully!', 'Success!'); + this.update.emit(); + }, error => this.toastr.error(error.message || 'Project update failed!', 'Oops!')); + } else { + this.projectService.createProject(data).subscribe(() => { + this.toastr.success('Project created successfully!', 'Success!'); + this.projectDataService.updateProjects(); + this.update.emit(); + this.reset(); + }, error => this.toastr.error(error.message || 'Project creation failed!', 'Oops!')); + } } public reset() { From 4e220cb1df2afdae678bb0bee177ee2cf806b15d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 17:57:41 +0300 Subject: [PATCH 078/357] [DLAB-635]: added grid refresh; apply after confirmations --- .../src/app/administration/project/project.component.html | 2 +- .../src/app/administration/project/project.component.ts | 6 +++--- .../main/resources/webapp/src/assets/styles/_theme.scss | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 9e46186420..956e1d7054 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -25,7 +25,7 @@
-
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 5abeabc0ce..59824b9ad3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -83,14 +83,14 @@ export class ProjectComponent implements OnInit, OnDestroy { public editProject($event) { this.dialog.open(EditProjectComponent, { data: { action: 'edit', item: $event }, panelClass: 'modal-xl-s' }) .afterClosed().subscribe(() => { - console.log('Update project'); + this.refreshGrid(); }); } public deleteProject($event) { this.dialog.open(NotificationDialogComponent, { data: { type: 'confirmation', item: $event }, panelClass: 'modal-sm' }) .afterClosed().subscribe(result => { - this.projectService.deleteProject($event.name).subscribe(() => { + result && this.projectService.deleteProject($event.name).subscribe(() => { this.refreshGrid(); }); }); @@ -114,7 +114,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
- +
`, diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index a298d0d249..434e3259f8 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -56,6 +56,12 @@ width: 80px; } } + &.butt-create { + color: #35afd5; + &:disabled{ + color: #577289!important; + } + } &:disabled { cursor: not-allowed; opacity: 0.6; @@ -106,6 +112,7 @@ display: inline-block; width: 50%; padding: 0 15px; + text-align: center; vertical-align: middle; color: #575757; cursor: pointer; From 240b68c7bb7390c0d6cb2729372a4141fa403b65 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 27 May 2019 17:58:33 +0300 Subject: [PATCH 079/357] [DLAB-635]: projects grid sizing added --- .../project/project-list/project-list.component.html | 8 ++++---- .../project/project-list/project-list.component.scss | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 42ebc72ccc..fd8f90749f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -19,19 +19,19 @@
-
Project name {{element.project_name}} {{element.name}} Endpoint name {{element.endpoints_list}} Endpoints {{element.endpoints}} Project tag {{element.project_tag}} Groups {{element.groups}}
+
- + - + - + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss index a41856fae9..c63f0df94e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -19,8 +19,19 @@ table { width: 100%; + .name { + width: 25%; + } + .endpoints { + width: 30%; + } + .groups { + width: 35%; + } .project-actions { color: #607d8b; + width: 10%; + text-align: center; span { transition: all .5s ease-in-out; cursor: pointer; From 8a348a0882b441a61661f76f338e90f9cc5f1b64 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 11:01:03 +0300 Subject: [PATCH 080/357] [DLAB-635]: fix displaying comditions; cleanup ref --- .../project/project-data.service.ts | 4 -- .../project/project.component.html | 38 ++++++++++--------- .../project/project.component.ts | 14 +++---- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts index 1df5a18a97..ad877f2e3b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -32,10 +32,6 @@ export class ProjectDataService { this.getProjectsList(); } - public getProjects() { - this._projects.asObservable(); - } - public updateProjects() { this.getProjectsList(); } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 956e1d7054..beabad0f3e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -17,24 +17,26 @@ ~ under the License. --> -
-
- -
-
- + +
+
+
+ +
+
+ +
-
- - - + + + -
- -
+
+ +
+
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 59824b9ad3..6a1f7a95b0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Component, OnInit, OnDestroy, Inject, ChangeDetectorRef } from '@angular/core'; +import { Component, OnInit, OnDestroy, Inject } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { Subscription } from 'rxjs'; @@ -38,7 +38,7 @@ export interface Project { styleUrls: ['./project.component.scss'] }) export class ProjectComponent implements OnInit, OnDestroy { - projects: Project[] = []; + projectList: Project[] = []; healthStatus: any; private subscriptions: Subscription = new Subscription(); @@ -47,18 +47,14 @@ export class ProjectComponent implements OnInit, OnDestroy { public dialog: MatDialog, private projectService: ProjectService, private projectDataService: ProjectDataService, - private healthStatusService: HealthStatusService, - private ref: ChangeDetectorRef, + private healthStatusService: HealthStatusService ) { } ngOnInit() { this.getEnvironmentHealthStatus(); this.subscriptions.add(this.projectDataService._projects.subscribe( (value: Project[]) => { - if (value) { - this.projects = value; - this.ref.detectChanges(); - } + if (value) this.projectList = value; })); } @@ -73,7 +69,7 @@ export class ProjectComponent implements OnInit, OnDestroy { createProject() { console.log('create'); - if (this.projects.length) + if (this.projectList.length) this.dialog.open(EditProjectComponent, { data: { action: 'create', item: null }, panelClass: 'modal-xl-s' }) .afterClosed().subscribe(() => { console.log('Create project'); From eed9369a16a12fca201cb4109dbef6d7be235f6a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 11:01:51 +0300 Subject: [PATCH 081/357] [DLAB-635]: disabled gields on edit form; set default tab --- .../project/project-form/project-form.component.html | 6 +++--- .../project/project-form/project-form.component.ts | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 0ed97e19d6..599e152b43 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -29,18 +29,18 @@
+ (blur)="generateProjectTag($event)" [ngClass]="{ 'not-allowed' : item }">
- +
- + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 996d3acc07..7d8ea6870a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -17,7 +17,7 @@ * under the License. */ - import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; + import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; @@ -38,6 +38,7 @@ export class ProjectFormComponent implements OnInit { @Input() item: any; @Output() update: EventEmitter<{}> = new EventEmitter(); + @ViewChild('stepper') stepper; constructor( public toastr: ToastrService, @@ -53,13 +54,16 @@ export class ProjectFormComponent implements OnInit { this.getGroupsData(); this.getEndpointsData(); - this.item && this.editSpecificProject(this.item); + if (this.item) { + this.editSpecificProject(this.item); + this.stepper.selectedIndex = 1; + } } public confirm(data) { if (this.item) { this.projectService.updateProject(data).subscribe(() => { - this.toastr.success('Project creupdatedated successfully!', 'Success!'); + this.toastr.success('Project updated successfully!', 'Success!'); this.update.emit(); }, error => this.toastr.error(error.message || 'Project update failed!', 'Oops!')); } else { From 63dd3b44329aede439e847f93c545aff4b4dd2f3 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 12:50:43 +0300 Subject: [PATCH 082/357] [DLAB-642]: collapse navigation bar fixes --- .../app/shared/navbar/navbar.component.html | 32 +++++++++++++------ .../app/shared/navbar/navbar.component.scss | 15 +++++++-- .../src/app/shared/navbar/navbar.component.ts | 2 +- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index eb341c59bc..b5fafecf20 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -73,31 +73,45 @@
- + - + diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss index b7b57a1187..2c17bd17da 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss @@ -123,15 +123,19 @@ a.nav-item { display: block; position: relative; height: 56px; - padding: 5px; + padding: 5px 10px; line-height: 48px; font-family: "Open Sans", sans-serif; transition: all .45s ease-in-out; text-decoration: none; font-size: 14px; overflow: hidden; - color: #577289; + color: #577289 !important; outline: none; + i { + vertical-align: middle; + padding-left: 12px; + } &:not(.has-children):hover { background: none !important; color: #36afd5; @@ -155,6 +159,11 @@ a.nav-item { .sub-nav-item { display: block; transition: all .45s ease-in-out; + margin-left: 30px; + i { + vertical-align: middle; + padding-left: 12px; + } &:hover { background: none !important; color: #36afd5; @@ -171,7 +180,7 @@ a.nav-item { padding: 0px; background: none; outline: none; - width: 56px; + width: 60px; height: 46px; cursor: pointer; border-radius: 0; diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index 72d4c33190..8efc7a78f7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -53,7 +53,7 @@ export class NavbarComponent implements OnInit, OnDestroy { quotesLimit: number = 70; isLoggedIn: boolean = false; metadata: any; - isExpanded: boolean = false; + isExpanded: boolean = true; healthStatus: GeneralEnvironmentStatus; subscriptions: Subscription = new Subscription(); From 4fb5bd8121286fc518af1c0c783c1f94cd8cf38d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 12:52:43 +0300 Subject: [PATCH 083/357] [DLAB-642]: added check before credentials dialog opening --- .../manage-ungit/manage-ungit.component.scss | 1 + .../manage-ungit/manage-ungit.component.ts | 25 ++++++++++--------- .../webapp/src/assets/styles/_theme.scss | 3 +-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss index 2c17f44f83..228c048c47 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss @@ -95,6 +95,7 @@ position: absolute; top: 45px; padding: 0; + font-size: 12px; } } .col { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts index 46acefe8a4..7bd6538dad 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts @@ -29,7 +29,7 @@ import { ManageUngitService } from '../../core/services'; selector: 'dlab-manage-ungit', templateUrl: './manage-ungit.component.html', styleUrls: ['./manage-ungit.component.scss', - '../exploratory/install-libraries/install-libraries.component.scss'] + '../exploratory/install-libraries/install-libraries.component.scss'] }) export class ManageUngitComponent implements OnInit { model: MangeUngitModel; @@ -57,21 +57,22 @@ export class ManageUngitComponent implements OnInit { } ngOnInit() { - // this.bindDialog.onClosing = () => this.cancelAllModifyings(); - this.open(); - this.initFormModel(); - this.getGitCredentials(); + this.model.getGitCredentials().subscribe( + (credentials: any) => { + this.gitCredentials = credentials.git_creds || []; + this.open(); + }, () => this.open()); } public open(): void { - this.model = new MangeUngitModel(response => { }, - error => this.toastr.error(error.message || 'Manage git credentials failed!', 'Oops!'), - () => { - if (!this.gitCredentials.length) - this.tabGroup.selectedIndex = 1; - }, - this.manageUngitService); + this.model = new MangeUngitModel(() => {}, + error => this.toastr.error(error.message || 'Manage git credentials failed!', 'Oops!'), + () => { + if (!this.gitCredentials.length) + this.tabGroup.selectedIndex = 1; + }, + this.manageUngitService); } public resetForm(): void { diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 434e3259f8..da8c80881d 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -21,12 +21,11 @@ .mat-raised-button { &.butt { width: 160px; - height: 35px; padding: 0 20px; border-radius: 0; font-style: normal; font-weight: 600; - font-size: 16px; + font-size: 15px; font-family: 'Open Sans', sans-serif; color: #577289; i { From c9693b5a96b8ad6202b008b2774721e39feaf82a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 13:47:04 +0300 Subject: [PATCH 084/357] [DLAB-642]: replaced ssn monitor dialog with nateroal component --- .../app/administration/management/index.ts | 3 +- .../management/management.component.ts | 6 +-- .../ssn-monitor/ssn-monitor.component.html | 49 ++++++++++--------- .../ssn-monitor/ssn-monitor.component.ts | 20 ++++---- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index 44237985d5..e246457c38 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -80,7 +80,8 @@ export * from './management.component'; ConfirmationDialogComponent, ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent, - BackupDilogComponent], + BackupDilogComponent, + SsnMonitorComponent], exports: [ManagementComponent] }) export class ManagenementModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index bf32a97c20..0671d5da95 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -35,6 +35,7 @@ import { import { EnvironmentModel, GeneralEnvironmentStatus } from './management.model'; import { HTTP_STATUS_CODES } from '../../core/util'; import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; +import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; @Component({ selector: 'environments-management', @@ -103,7 +104,6 @@ export class ManagementComponent implements OnInit, OnDestroy { } showBackupDialog() { - // if (!this.backupDialog.isOpened) this.backupDialog.open({ isFooter: false }); this.dialog.open(BackupDilogComponent, { panelClass: 'modal-sm' }) .afterClosed().subscribe(() => this.buildGrid()); } @@ -124,8 +124,8 @@ export class ManagementComponent implements OnInit, OnDestroy { } openSsnMonitorDialog() { - this.healthStatusService.getSsnMonitorData() - .subscribe(data => this.ssnMonitorDialog.open({ isFooter: false }, data), + this.healthStatusService.getSsnMonitorData().subscribe( + data => this.dialog.open(SsnMonitorComponent, {data: data, panelClass: 'modal-lg' }), () => this.toastr.error('Failed ssn data loading!', 'Oops!')); } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html index 3d132661dc..a4f9cf5617 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html @@ -17,43 +17,44 @@ ~ under the License. --> - - +
+

SSN Monitor

- - -
+ +
+
+
- +
Name
-
{{ monitorData.processorInfo.name }}
+
{{ data.processorInfo.name }}
Vendor
-
{{ monitorData.processorInfo.vendor }}
+
{{ data.processorInfo.vendor }}
Logical Core Count
-
{{ monitorData.processorInfo.logicalCoreCount }}
+
{{ data.processorInfo.logicalCoreCount }}
Physical Core Count
-
{{ monitorData.processorInfo.physicalCoreCount }}
+
{{ data.processorInfo.physicalCoreCount }}
Current System Load
-
{{ monitorData.processorInfo.currentSystemLoad /100 | percent:'1.0-2' }}
+
{{ data.processorInfo.currentSystemLoad /100 | percent:'1.0-2' }}
System Load Average
-
{{ monitorData.processorInfo.systemLoadAverage /100 | percent:'1.0-2' }}
+
{{ data.processorInfo.systemLoadAverage /100 | percent:'1.0-2' }}
CPU 64 Bit
-
{{ monitorData.processorInfo.cpu64Bit }}
+
{{ data.processorInfo.cpu64Bit }}
@@ -62,34 +63,34 @@

SSN Monitor

Available Memory
-
{{ convertSize(monitorData.memoryInfo.availableMemory) }}
+
{{ convertSize(data.memoryInfo.availableMemory) }}
Total Memory
-
{{ convertSize(monitorData.memoryInfo.totalMemory) }}
+
{{ convertSize(data.memoryInfo.totalMemory) }}
Swap Total
-
{{ convertSize(monitorData.memoryInfo.swapTotal) }}
+
{{ convertSize(data.memoryInfo.swapTotal) }}
Swap Used
-
{{ convertSize(monitorData.memoryInfo.swapUsed) }}
+
{{ convertSize(data.memoryInfo.swapUsed) }}
Pages Page In
-
{{ convertSize(monitorData.memoryInfo.pagesPageIn) }}
+
{{ convertSize(data.memoryInfo.pagesPageIn) }}
Pages Page Out
-
{{ convertSize(monitorData.memoryInfo.pagesPageOut) }}
+
{{ convertSize(data.memoryInfo.pagesPageOut) }}
-
+
Disk {{i +1}}
 @@ -106,12 +107,12 @@

SSN Monitor

- +
-
+
No ssn monitor data available
- - +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts index 3d954996d5..10212132a0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts @@ -17,7 +17,9 @@ * under the License. */ -import { Component, OnInit, ViewChild, Output, EventEmitter, ViewEncapsulation } from '@angular/core'; +import { Component, OnInit, ViewEncapsulation, Inject } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; + import { DICTIONARY } from '../../../../dictionary/global.dictionary'; @Component({ @@ -32,17 +34,13 @@ export class SsnMonitorComponent implements OnInit { public errorMessage: string = ''; public monitorData = {}; - @ViewChild('bindDialog') bindDialog; - @Output() manageEnv: EventEmitter<{}> = new EventEmitter(); - - ngOnInit() {} + constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef, + ) { } - public open(param, data): void { - this.monitorData = data || {}; - this.bindDialog.open(param); - } - public close(param, data): void { - this.bindDialog.close(); + ngOnInit() { + this.monitorData = this.data || {}; } public isEmpty(obj) { From 3b0a8fff7b280d35e243b381f7a260061e8190c7 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 13:47:42 +0300 Subject: [PATCH 085/357] [DLAB-642]: backup aligning fixess --- .../management/backup-dilog/backup-dilog.component.html | 4 ++-- .../src/main/resources/webapp/src/assets/styles/_theme.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html index 63be3b76d7..545c236fb0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html @@ -17,13 +17,13 @@ ~ under the License. --> -
+

Backup options

-
+
Date: Tue, 28 May 2019 13:48:59 +0300 Subject: [PATCH 086/357] [DLAB-642]: conponents loading cleanup --- .../app/administration/management/management.component.html | 4 ---- .../webapp/src/app/shared/navbar/navbar.component.html | 4 ++-- .../webapp/src/app/shared/navbar/navbar.component.scss | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index e14404eddc..44fbfb589f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -42,14 +42,10 @@ - - - \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index b5fafecf20..9afd109948 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -86,14 +86,14 @@ Administration - Environment Management account_box - diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss index 2c17bd17da..2f036fe3ae 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss @@ -159,14 +159,13 @@ a.nav-item { .sub-nav-item { display: block; transition: all .45s ease-in-out; - margin-left: 30px; i { vertical-align: middle; padding-left: 12px; } &:hover { background: none !important; - color: #36afd5; + color: #36afd5 !important; } } } From e41a72d41641fdab8fbc1c1d7933291b3ea9eb21 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 15:32:20 +0300 Subject: [PATCH 087/357] [DLAB-642]: replaced env management and budget with material component --- .../endpoints/endpoints.component.html | 48 +++++++++++++ .../endpoints/endpoints.component.scss | 19 ++++++ .../endpoints/endpoints.component.ts | 53 +++++++++++++++ .../app/administration/management/index.ts | 3 +- .../manage-environment-dilog.component.html | 19 +++--- .../manage-environment-dilog.component.ts | 32 +++++---- .../management/management.component.html | 4 -- .../management/management.component.ts | 67 ++++++++++--------- .../ssn-monitor/ssn-monitor.component.scss | 1 + 9 files changed, 184 insertions(+), 62 deletions(-) create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html new file mode 100644 index 0000000000..4d0cec021f --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html @@ -0,0 +1,48 @@ + + + +
+
+

Create endpoint

+ +
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ + +
+
+
+
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss new file mode 100644 index 0000000000..510f082c6f --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss @@ -0,0 +1,19 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts new file mode 100644 index 0000000000..7e14965312 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, OnInit, Inject } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; + +@Component({ + selector: 'endpoints', + templateUrl: './endpoints.component.html', + styleUrls: ['./endpoints.component.scss'] +}) +export class EndpointsComponent implements OnInit { + public createAMIForm: FormGroup; + namePattern = '[-_a-zA-Z0-9]+'; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef, + private _fb: FormBuilder, + ) { } + + ngOnInit() { + + } + + public assignChanges(data) { + console.log('Create', data); + } + + private initFormModel(): void { + this.createAMIForm = this._fb.group({ + name: ['', Validators.required], + description: [''] + }); + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index e246457c38..e3bbb00057 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -81,7 +81,8 @@ export * from './management.component'; ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent, BackupDilogComponent, - SsnMonitorComponent], + SsnMonitorComponent, + ManageEnvironmentComponent], exports: [ManagementComponent] }) export class ManagenementModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html index 094ec9b1d6..3f183bdf20 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html @@ -17,13 +17,14 @@ ~ under the License. --> - - +
+

Manage environment

- - + +
+
-
+
@@ -60,14 +61,14 @@

Manage environment

- +
-
No active users environments
+
No active users environments
- - +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts index ae7d7d11f3..8831fd9080 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Component, ViewChild, Output, EventEmitter, ViewEncapsulation, Inject } from '@angular/core'; +import { Component, Output, EventEmitter, ViewEncapsulation, Inject, OnInit } from '@angular/core'; import { Validators, FormBuilder, FormGroup, FormArray } from '@angular/forms'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; @@ -28,40 +28,38 @@ import { DICTIONARY } from '../../../../dictionary/global.dictionary'; styleUrls: ['./manage-environment-dilog.component.scss'], encapsulation: ViewEncapsulation.None }) -export class ManageEnvironmentComponent { +export class ManageEnvironmentComponent implements OnInit { readonly DICTIONARY = DICTIONARY; - public usersList: Array = []; + // public usersList: Array = []; public manageUsersForm: FormGroup; public manageTotalsForm: FormGroup; - @ViewChild('bindDialog') bindDialog; @Output() manageEnv: EventEmitter<{}> = new EventEmitter(); - @Output() setBudget: EventEmitter<{}> = new EventEmitter(); + // @Output() setBudget: EventEmitter<{}> = new EventEmitter(); constructor( + @Inject(MAT_DIALOG_DATA) public data: any, private _fb: FormBuilder, - public dialog: MatDialog + public dialog: MatDialog, + public dialogRef: MatDialogRef ) { } - get usersEnvironments(): FormArray { - return this.manageUsersForm.get('users'); - } - - public open(param, data, settings): void { - this.usersList = data; + ngOnInit() { !this.manageUsersForm && this.initForm(); this.manageUsersForm.setControl('users', - this._fb.array((this.usersList || []).map((x: any) => this._fb.group({ + this._fb.array((this.data.usersList || []).map((x: any) => this._fb.group({ name: x.name, budget: [x.budget, [Validators.min(0), this.userValidityCheck.bind(this)]], status: x.status })))); - this.manageUsersForm.controls['total'].setValue(settings.conf_max_budget || null); - this.bindDialog.open(param); + this.manageUsersForm.controls['total'].setValue(this.data.total.conf_max_budget || null); + } + + get usersEnvironments(): FormArray { + return this.manageUsersForm.get('users'); } public setBudgetLimits(value) { - this.setBudget.emit(value); - this.bindDialog.close(); + this.dialogRef.close(value); } public applyAction(action, user) { diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index 44fbfb589f..a3125ab9c6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -41,10 +41,6 @@ (actionToggle)="manageEnvironmentAction($event)"> - - - - diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index 0671d5da95..4f4b189d8f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -36,6 +36,7 @@ import { EnvironmentModel, GeneralEnvironmentStatus } from './management.model'; import { HTTP_STATUS_CODES } from '../../core/util'; import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; +import { ManageEnvironmentComponent } from './manage-environment/manage-environment-dilog.component'; @Component({ selector: 'environments-management', @@ -70,7 +71,7 @@ export class ManagementComponent implements OnInit, OnDestroy { private userResourceService: UserResourceService, private rolesService: RolesGroupsService, private storageService: StorageService - ) {} + ) { } ngOnInit() { this.buildGrid(); @@ -105,7 +106,7 @@ export class ManagementComponent implements OnInit, OnDestroy { showBackupDialog() { this.dialog.open(BackupDilogComponent, { panelClass: 'modal-sm' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe(() => this.buildGrid()); } getActiveUsersList() { @@ -118,23 +119,27 @@ export class ManagementComponent implements OnInit, OnDestroy { openManageEnvironmentDialog() { this.getActiveUsersList().subscribe(usersList => { - this.getTotalBudgetData().subscribe(total => this.manageEnvironmentDialog.open({ isFooter: false }, usersList, total)); - }, - () => this.toastr.error('Failed users list loading!', 'Oops!')); + this.getTotalBudgetData().subscribe( + total => { + const dialogRef = this.dialog.open(ManageEnvironmentComponent, { data: { usersList, total }, panelClass: 'modal-xl-s'}); + dialogRef.componentInstance.manageEnv.subscribe((data) => this.manageEnvironment(data)); + dialogRef.afterClosed().subscribe(result => result && this.setBudgetLimits(result)); + }, () => this.toastr.error('Failed users list loading!', 'Oops!')); + }); } openSsnMonitorDialog() { this.healthStatusService.getSsnMonitorData().subscribe( - data => this.dialog.open(SsnMonitorComponent, {data: data, panelClass: 'modal-lg' }), + data => this.dialog.open(SsnMonitorComponent, { data: data, panelClass: 'modal-lg' }), () => this.toastr.error('Failed ssn data loading!', 'Oops!')); } openManageRolesDialog() { this.rolesService.getGroupsData().subscribe(group => { - this.rolesService.getRolesData().subscribe( - roles => this.rolesGroupsDialog.open({ isFooter: false }, group, roles), - error => this.toastr.error(error.message, 'Oops!')); - }, + this.rolesService.getRolesData().subscribe( + roles => this.rolesGroupsDialog.open({ isFooter: false }, group, roles), + error => this.toastr.error(error.message, 'Oops!')); + }, error => this.toastr.error(error.message, 'Oops!')); } @@ -155,7 +160,7 @@ export class ManagementComponent implements OnInit, OnDestroy { this.toastr.success('Backup configuration is processing!', 'Processing!'); this.clear = window.setInterval(() => this.getBackupStatus(result), 3000); }, - error => this.toastr.error(error.message, 'Oops!')); + error => this.toastr.error(error.message, 'Oops!')); } manageRolesGroups($event) { @@ -194,8 +199,8 @@ export class ManagementComponent implements OnInit, OnDestroy { this.healthStatusService.updateUsersBudget($event.users).subscribe((result: any) => { this.healthStatusService.updateTotalBudgetData($event.total).subscribe((res: any) => { result.status === HTTP_STATUS_CODES.OK - && res.status === HTTP_STATUS_CODES.NO_CONTENT - && this.toastr.success('Budget limits updated!', 'Success!'); + && res.status === HTTP_STATUS_CODES.NO_CONTENT + && this.toastr.success('Budget limits updated!', 'Success!'); this.buildGrid(); }); }, error => this.toastr.error(error.message, 'Oops!')); @@ -207,17 +212,17 @@ export class ManagementComponent implements OnInit, OnDestroy { error => this.toastr.error(error.message, 'Oops!')); } - manageEnvironment(event: {action: string, user: string}) { + manageEnvironment(event: { action: string, user: string }) { this.healthStatusService .manageEnvironment(event.action, event.user) .subscribe(res => { - this.getActiveUsersList().subscribe(usersList => { - this.manageEnvironmentDialog.usersList = usersList; - this.toastr.success(`Action ${ event.action } is processing!`, 'Processing!'); - this.buildGrid(); - }); - }, - error => this.toastr.error(error.message, 'Oops!')); + this.getActiveUsersList().subscribe(usersList => { + this.manageEnvironmentDialog.usersList = usersList; + this.toastr.success(`Action ${event.action} is processing!`, 'Processing!'); + this.buildGrid(); + }); + }, + error => this.toastr.error(error.message, 'Oops!')); } private getExploratoryList() { @@ -234,8 +239,8 @@ export class ManagementComponent implements OnInit, OnDestroy { .subscribe((backupStatus: any) => { if (!this.creatingBackup) { backupStatus.status === 'FAILED' - ? this.toastr.error('Backup configuration failed!', 'Oops!') - : this.toastr.success('Backup configuration completed!', 'Success!'); + ? this.toastr.error('Backup configuration failed!', 'Oops!') + : this.toastr.success('Backup configuration completed!', 'Success!'); clearInterval(this.clear); } }, () => { @@ -257,14 +262,14 @@ export class ManagementComponent implements OnInit, OnDestroy { private loadEnvironmentList(data): Array { if (data) return data.map(value => new EnvironmentModel( - value.resource_name || value.resource_type, - value.status, - value.shape, - value.computational_resources, - value.user, - value.public_ip, - value.resource_type - )); + value.resource_name || value.resource_type, + value.status, + value.shape, + value.computational_resources, + value.user, + value.public_ip, + value.resource_type + )); } private getEnvironmentHealthStatus() { diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.scss index 769fefeeef..988116510c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.scss @@ -20,6 +20,7 @@ .ssn-monitor-dialog { .content-box { padding-top: 10px !important; + position: relative; } .ssn-info { min-height: 400px; From c60b1fb05fc4ce9929fe89f83d93f500c127e0e5 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 16:45:19 +0300 Subject: [PATCH 088/357] [DLAB-642]: added endpoint creation form --- .../management/endpoints/endpoints.component.html | 10 ++++++++-- .../management/endpoints/endpoints.component.ts | 11 ++++++----- .../webapp/src/app/administration/management/index.ts | 5 ++++- .../management/management.component.html | 5 ++++- .../administration/management/management.component.ts | 6 ++++++ 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html index 4d0cec021f..774cea9788 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html @@ -33,9 +33,15 @@

Create endpoint

- +
- + +
+
+
+ +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts index 7e14965312..23dbc36585 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts @@ -27,7 +27,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; styleUrls: ['./endpoints.component.scss'] }) export class EndpointsComponent implements OnInit { - public createAMIForm: FormGroup; + public createEndpointForm: FormGroup; namePattern = '[-_a-zA-Z0-9]+'; constructor( @@ -37,17 +37,18 @@ export class EndpointsComponent implements OnInit { ) { } ngOnInit() { - + this.initFormModel(); } public assignChanges(data) { - console.log('Create', data); + console.log('Create', data); } private initFormModel(): void { - this.createAMIForm = this._fb.group({ + this.createEndpointForm = this._fb.group({ name: ['', Validators.required], - description: [''] + url: ['', Validators.required], + account: ['', Validators.required] }); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index e3bbb00057..f5146e47ec 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -42,6 +42,7 @@ import { GroupNameValidationDirective } from './manage-roles-groups/group-name-v import { DirectivesModule } from '../../core/directives'; import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; +import { EndpointsComponent } from './endpoints/endpoints.component'; import { ManageRolesGroupsComponent, ConfirmDeleteUserAccountDialogComponent } from './manage-roles-groups/manage-roles-groups.component'; import { ProjectModule } from '../project'; @@ -74,7 +75,8 @@ export * from './management.component'; ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent, SsnMonitorComponent, - ManageRolesGroupsComponent + ManageRolesGroupsComponent, + EndpointsComponent ], entryComponents: [ ConfirmationDialogComponent, @@ -82,6 +84,7 @@ export * from './management.component'; ConfirmDeleteUserAccountDialogComponent, BackupDilogComponent, SsnMonitorComponent, + EndpointsComponent, ManageEnvironmentComponent], exports: [ManagementComponent] }) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index a3125ab9c6..fb159c2bea 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -19,7 +19,10 @@
- +
+ + Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special characters +
+ + Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special characters +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts index caad7c83c3..9ad5b976d8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts @@ -39,6 +39,7 @@ export class EndpointsComponent implements OnInit { public createEndpointForm: FormGroup; namePattern = '[-_a-zA-Z0-9]+'; endpoints: Endpoint[] = []; + constructor( @Inject(MAT_DIALOG_DATA) public data: any, public toastr: ToastrService, @@ -61,9 +62,9 @@ export class EndpointsComponent implements OnInit { private initFormModel(): void { this.createEndpointForm = this._fb.group({ - name: ['', Validators.required], - url: ['', Validators.required], - account: ['', Validators.required] + name: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], + url: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], + account: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])] }); } diff --git a/services/self-service/src/main/resources/webapp/src/app/login/login.component.html b/services/self-service/src/main/resources/webapp/src/app/login/login.component.html index c518b3f28c..f54a02c77a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/login/login.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/login/login.component.html @@ -34,7 +34,7 @@
-
priority_high{{ error }}
+
priority_high{{ error }}
-
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 58269fa77c..c4ad580413 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -119,11 +119,14 @@ mat-chip.mat-chip strong { .terminated, .terminating, -.failed, -.error { +.failed { color: #f1696e; } +.error { + color: #f1696e; + font-size: 12px; +} .not-allowed { cursor: not-allowed !important; user-select: none; From 65604f4a2a88726b2cb9c72c101508b5cb0e44a3 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 28 May 2019 17:47:09 +0300 Subject: [PATCH 092/357] [DLAB-631]: fixed endpoint selection --- .../project/project-form/project-form.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 599e152b43..388c340323 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -50,8 +50,8 @@ clear None - - {{ group }} + + {{ endpoint.name }} Endpoints list is empty From 763565fdffa3b153aa3c95a1dd87bd8cb2506fb6 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 29 May 2019 12:21:16 +0300 Subject: [PATCH 093/357] [DLAB-631]: added endpoint validation extention --- .../project/project-form/project-form.component.ts | 7 ++++--- .../install-libraries/install-libraries.component.ts | 11 ++--------- .../app/resources/scheduler/scheduler.component.html | 2 +- .../app/resources/scheduler/scheduler.component.scss | 3 +++ .../src/app/shared/navbar/navbar.component.scss | 10 ++++++++-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 7d8ea6870a..9cdc780d19 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -31,6 +31,7 @@ styleUrls: ['./project-form.component.scss'] }) export class ProjectFormComponent implements OnInit { + namePattern = '[-_a-zA-Z0-9]+'; public projectForm: FormGroup; public groupsList: any = []; @@ -91,9 +92,9 @@ export class ProjectFormComponent implements OnInit { private initFormModel(): void { this.projectForm = this._fb.group({ - 'name': ['', Validators.required], - 'endpoints': [[]], - 'tag': ['', Validators.required], + 'name': ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], + 'endpoints': [[], Validators.required], + 'tag': ['',Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], 'groups': [[], Validators.required] }); } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts index 8075eee97c..a41e6919f3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts @@ -18,18 +18,11 @@ */ -import {debounceTime} from 'rxjs/operators'; -import { Component, - OnInit, - ViewChild, - Output, - EventEmitter, - ViewEncapsulation, - ChangeDetectorRef, - Inject } from '@angular/core'; +import { Component, OnInit, ViewChild, ViewEncapsulation, ChangeDetectorRef, Inject } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { FormControl } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; +import { debounceTime } from 'rxjs/operators'; import { InstallLibrariesModel } from './install-libraries.model'; import { LibrariesInstallationService} from '../../../core/services'; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html index e3e7c6b90f..bedb7ac215 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
+

Scheduler for diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.scss index e698b2421c..87fa93ee02 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.scss @@ -44,6 +44,7 @@ .enable-schedule { display: flex; margin-bottom: 10px; + justify-content: space-between; .idle { display: flex; width: 50%; @@ -171,6 +172,8 @@ .mat-button-toggle-standalone { box-shadow: none; margin: 2px; + border: none; + color: #607D8B; &.mat-button-toggle-checked { background-color: rgba(77, 184, 218, 0.62); color: #ffffff; diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss index 2f036fe3ae..ac83142530 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss @@ -134,7 +134,7 @@ a.nav-item { outline: none; i { vertical-align: middle; - padding-left: 12px; + padding-left: 8px; } &:not(.has-children):hover { background: none !important; @@ -161,7 +161,7 @@ a.nav-item { transition: all .45s ease-in-out; i { vertical-align: middle; - padding-left: 12px; + padding-left: 8px; } &:hover { background: none !important; @@ -228,3 +228,9 @@ a.nav-item { -o-transform: translateY(-4px) translateX(6px) rotate(-45deg); transform: translateY(-4px) translateX(6px) rotate(-45deg); } + +mat-sidenav-content { + &.mat-drawer-content { + transition: all 0.35s ease-out; + } +} \ No newline at end of file From 761393dab32dfd7c600f9e41d8f2f5364fa790ac Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 29 May 2019 13:28:00 +0300 Subject: [PATCH 094/357] [DLAB-631]: fixed parameters passing impacted prod build --- .../project/project-form/project-form.component.html | 4 ++-- .../main/resources/webapp/src/app/login/login.component.html | 2 +- .../notification-dialog/notification-dialog.component.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 388c340323..fea70ccd39 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -43,10 +43,10 @@ - + playlist_add_check All - + clear None diff --git a/services/self-service/src/main/resources/webapp/src/app/login/login.component.html b/services/self-service/src/main/resources/webapp/src/app/login/login.component.html index f54a02c77a..c518b3f28c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/login/login.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/login/login.component.html @@ -34,7 +34,7 @@

-
priority_high{{ error }}
+
priority_high{{ error }}
-
+
Following notebook servers From 72b6fb9bc68f4b8af927e0c71cbe435ea4bd596a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:13:54 +0300 Subject: [PATCH 095/357] [DLAB-631]: fixed backdrop issue on 403 page --- .../src/app/access-denied/access-denied.component.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.scss b/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.scss index df5285991c..eb3eac213b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.scss @@ -17,14 +17,9 @@ * under the License. */ .no-access-page { - position: absolute; - top: 0; - left: 0; - width: 100%; height: 100%; background: #f5f5f5; color: #8c8888; - z-index: -1; .content { position: absolute; top: 0; From 536904efd98e28de9cbb46a2b62ae77d90a531b0 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:15:28 +0300 Subject: [PATCH 096/357] [DLAB-631]: added Delete Endpoint --- .../core/services/applicationServiceFacade.service.ts | 6 ++++++ .../webapp/src/app/core/services/endpoint.service.ts | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index 9039f20a8b..4f7330d9d3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -551,6 +551,12 @@ export class ApplicationServiceFacade { data); } + public buildDeleteEndpoint(param): Observable { + return this.buildRequest(RequestMethod.Delete, + this.requestRegistry.Item(ApplicationServiceFacade.ENDPOINT) + param, + null); + } + private setupRegistry(): void { this.requestRegistry = new Dictionary(); diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts index 970956eabf..98801b404c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts @@ -46,5 +46,14 @@ export class EndpointService { map(response => response), catchError(ErrorUtils.handleServiceError)); } + + public deleteEndpoint(data): Observable { + const url = `/${data}`; + return this.applicationServiceFacade + .buildDeleteEndpoint(url) + .pipe( + map(response => response), + catchError(ErrorUtils.handleServiceError)); + } } From 484d8d6bac3cf8f6769482eb90031a9038636b1b Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:23:32 +0300 Subject: [PATCH 097/357] [DLAB-631]: added admin guard to check user access --- .../webapp/src/app/core/core.module.ts | 2 ++ .../src/app/core/services/admin.quard.ts | 31 +++++++++++++++++++ .../webapp/src/app/core/services/index.ts | 1 + 3 files changed, 34 insertions(+) create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/services/admin.quard.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts index 02806654d6..4b308c3b9e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts @@ -27,6 +27,7 @@ import { UserAccessKeyService } from './services/userAccessKey.service'; import { UserResourceService } from './services/userResource.service'; import { AuthorizationGuard } from './services/authorization.guard'; import { CloudProviderGuard } from './services/cloudProvider.guard'; +import { AdminGuard } from './services/admin.quard'; import { CheckParamsGuard } from './services/checkParams.guard'; import { LibrariesInstallationService } from './services/librariesInstallation.service'; import { ManageUngitService } from './services/manageUngit.service'; @@ -57,6 +58,7 @@ export class CoreModule { providers: [ ApplicationSecurityService, AuthorizationGuard, + AdminGuard, CloudProviderGuard, CheckParamsGuard, UserAccessKeyService, diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/admin.quard.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/admin.quard.ts new file mode 100644 index 0000000000..a58e4cce99 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/admin.quard.ts @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Injectable } from '@angular/core'; +import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; +import { HealthStatusService } from './healthStatus.service'; + +@Injectable() +export class AdminGuard implements CanActivate { + constructor(private _healthStatus: HealthStatusService) {} + + canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) { + return this._healthStatus.isPassageway('administration'); + } +} diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts index 803fd9d8eb..caf1904e90 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts @@ -24,6 +24,7 @@ export * from './healthStatus.service'; export * from './userAccessKey.service'; export * from './userResource.service'; export * from './authorization.guard'; +export * from './admin.quard'; export * from './cloudProvider.guard'; export * from './checkParams.guard'; export * from './librariesInstallation.service'; From deffcedfb8e46cebc2ad1f9737a93933bf76156e Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:24:13 +0300 Subject: [PATCH 098/357] [DLAB-631]: modified passageway to check user access --- .../webapp/src/app/core/services/cloudProvider.guard.ts | 2 +- .../webapp/src/app/core/services/healthStatus.service.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/cloudProvider.guard.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/cloudProvider.guard.ts index 5ebfa1efa5..7127cc0972 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/cloudProvider.guard.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/cloudProvider.guard.ts @@ -26,6 +26,6 @@ export class CloudProviderGuard implements CanActivate { constructor(private _healthStatus: HealthStatusService) {} canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) { - return this._healthStatus.isBillingEnabled(); + return this._healthStatus.isPassageway('billing'); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts index 68795b294f..8dbad932fd 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts @@ -108,17 +108,21 @@ export class HealthStatusService { catchError(ErrorUtils.handleServiceError)); } - public isBillingEnabled(): Observable { + public isPassageway(parameter: string): Observable { return this.applicationServiceFacade .buildGetEnvironmentHealthStatus() .pipe( map(response => { if (response.status === HTTP_STATUS_CODES.OK) { const data = response.body; - if (!data.billingEnabled) { + if (parameter === 'billing' && !data.billingEnabled) { this.appRoutingService.redirectToHomePage(); return false; } + if (parameter === 'administration' && !data.admin) { + this.appRoutingService.redirectToNoAccessPage(); + return false; + } } return true; })); From 9598995a4b353953870355a9733b97b3ae9ba4da Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:26:00 +0300 Subject: [PATCH 099/357] [DLAB-631]: moved manage roles functionality into separate page --- .../manage-roles-groups.component.html | 154 ----------------- .../group-name-validarion.directive.ts | 0 .../src/app/administration/roles/index.ts | 41 +++++ .../administration/roles/roles.component.html | 161 ++++++++++++++++++ .../roles.component.scss} | 0 .../roles.component.ts} | 82 +++++++-- 6 files changed, 269 insertions(+), 169 deletions(-) delete mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html rename services/self-service/src/main/resources/webapp/src/app/administration/{management/manage-roles-groups => roles}/group-name-validarion.directive.ts (100%) create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html rename services/self-service/src/main/resources/webapp/src/app/administration/{management/manage-roles-groups/manage-roles-groups.component.scss => roles/roles.component.scss} (100%) rename services/self-service/src/main/resources/webapp/src/app/administration/{management/manage-roles-groups/manage-roles-groups.component.ts => roles/roles.component.ts} (68%) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html deleted file mode 100644 index b21d860f64..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - -

Manage roles

- - -
- - - - Groups -
- -
Group name can only contain letters, numbers, hyphens and '_'
-
Group name already exists
-
-
- - -
- - - Roles -
-
- - - - - - playlist_add_check All - - - clear None - - - - {{ role }} - - - - -
-
-
- - - -
- - - Users -
- -
-
- - - -
- - - -
-
Project name Project name {{element.name}} Endpoints Endpoints {{element.endpoints}} Groups Groups {{element.groups}}
- - - - - - - - - - - - -
NameRolesUsersAction
{{ item.group }} -
- - - - - playlist_add_check All - - - clear None - - - - {{ role }} - - - - -
- 		- - - - -
- - - {{ user }} - clear - - -
- 		- - - -
-
-
- - - diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/group-name-validarion.directive.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/group-name-validarion.directive.ts similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/group-name-validarion.directive.ts rename to services/self-service/src/main/resources/webapp/src/app/administration/roles/group-name-validarion.directive.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts new file mode 100644 index 0000000000..d0c57ccbea --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; + +import { MaterialModule } from '../../shared/material.module'; +import { FormControlsModule } from '../../shared/form-controls'; +import { RolesComponent, ConfirmDeleteUserAccountDialogComponent } from './roles.component'; +import { GroupNameValidationDirective } from './group-name-validarion.directive'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + MaterialModule, + FormControlsModule + ], + declarations: [RolesComponent, ConfirmDeleteUserAccountDialogComponent, GroupNameValidationDirective], + entryComponents: [ConfirmDeleteUserAccountDialogComponent], + exports: [RolesComponent] +}) +export class RolesModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html new file mode 100644 index 0000000000..cade0b632e --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html @@ -0,0 +1,161 @@ + + + +
+ + + + Groups +
+ +
Group name can only + contain letters, numbers, hyphens and '_'
+
Group name already + exists
+
+
+ + +
+ + + Roles +
+
+ + + + + + playlist_add_check All + + + clear None + + + + {{ role }} + + + + +
+
+
+ + + +
+ + + Users +
+ +
+
+ + + +
+ + + +
+ + + + + + + + + + + + + +
NameRolesUsersAction
{{ item.group }} +
+ + + + + playlist_add_check All + + + clear None + + + + {{ role }} + + + + +
+ 		+ + + + +
+ + + {{ user }} + clear + + +
+ 		+ + + +
+
+
+ \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.scss rename to services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts similarity index 68% rename from services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.ts rename to services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts index bc91c947fd..8bc7b8d951 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-roles-groups/manage-roles-groups.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts @@ -17,17 +17,20 @@ * under the License. */ -import { Component, OnInit, ViewChild, Output, EventEmitter, Inject } from '@angular/core'; -import { ValidatorFn, FormControl, NgModel } from '@angular/forms'; +import { Component, OnInit, Output, EventEmitter, Inject } from '@angular/core'; +import { ValidatorFn, FormControl } from '@angular/forms'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { DICTIONARY } from '../../../../dictionary/global.dictionary'; +import { ToastrService } from 'ngx-toastr'; + +import { RolesGroupsService } from '../../core/services'; +import { DICTIONARY } from '../../../dictionary/global.dictionary'; @Component({ - selector: 'dlab-manage-roles-groups', - templateUrl: './manage-roles-groups.component.html', - styleUrls: ['../../../resources/resources-grid/resources-grid.component.css', './manage-roles-groups.component.scss'] + selector: 'dlab-roles', + templateUrl: './roles.component.html', + styleUrls: ['../../resources/resources-grid/resources-grid.component.css', './roles.component.scss'] }) -export class ManageRolesGroupsComponent implements OnInit { +export class RolesComponent implements OnInit { readonly DICTIONARY = DICTIONARY; public groupsData: Array = []; @@ -41,23 +44,40 @@ export class ManageRolesGroupsComponent implements OnInit { public delimitersRegex = /[-_]?/g; public groupnamePattern = new RegExp(/^[a-zA-Z0-9_\-]+$/); - @ViewChild('bindDialog') bindDialog; @Output() manageRolesGroupAction: EventEmitter<{}> = new EventEmitter(); stepperView: boolean = false; - constructor(public dialog: MatDialog) { } + constructor( + public toastr: ToastrService, + public dialog: MatDialog, + private rolesService: RolesGroupsService + ) { } ngOnInit() { - this.bindDialog.onClosing = () => this.resetDialog(); + this.openManageRolesDialog() + } + + openManageRolesDialog() { + this.rolesService.getGroupsData().subscribe(group => { + this.rolesService.getRolesData().subscribe( + roles => this.open(group, roles), + error => this.toastr.error(error.message, 'Oops!')); + }, + error => this.toastr.error(error.message, 'Oops!')); } - public open(param, groups, roles): void { + getGroupsData() { + this.rolesService.getGroupsData().subscribe( + list => this.updateGroupData(list), + error => this.toastr.error(error.message, 'Oops!')); + } + + public open(groups, roles): void { this.roles = roles; this.rolesList = roles.map(role => role.description); this.updateGroupData(groups); this.stepperView = false; - this.bindDialog.open(param); } public onUpdate($event) { @@ -75,7 +95,7 @@ export class ManageRolesGroupsComponent implements OnInit { public manageAction(action: string, type: string, item?: any, value?) { if (action === 'create') { - this.manageRolesGroupAction.emit( + this.manageRolesGroups( { action, type, value: { name: this.setupGroup, users: this.setupUser ? this.setupUser.split(',').map(elem => elem.trim()) : [], @@ -95,11 +115,11 @@ export class ManageRolesGroupsComponent implements OnInit { const emitValue = (type === 'users') ? {action, type, id: item.name, value: { user: value, group: item.group }} : {action, type, id: item.name, value: item.group} ; - this.manageRolesGroupAction.emit(emitValue); + this.manageRolesGroups(emitValue); } }); } else if (action === 'update') { - this.manageRolesGroupAction.emit({action, type, value: { + this.manageRolesGroups({action, type, value: { name: item.group, roleIds: this.extractIds(this.roles, item.selected_roles), users: item.users || [] }}); @@ -107,6 +127,38 @@ export class ManageRolesGroupsComponent implements OnInit { this.resetDialog(); } + manageRolesGroups($event) { + switch ($event.action) { + case 'create': + this.rolesService.setupNewGroup($event.value).subscribe(res => { + this.toastr.success('Group creation success!', 'Created!'); + this.getGroupsData(); + }, () => this.toastr.error('Group creation failed!', 'Oops!')); + break; + case 'update': + this.rolesService.updateGroup($event.value).subscribe(res => { + this.toastr.success('Group data successfully updated!', 'Success!'); + this.getGroupsData(); + }, () => this.toastr.error('Failed group data updating!', 'Oops!')); + break; + case 'delete': + if ($event.type === 'users') { + this.rolesService.removeUsersForGroup($event.value).subscribe(res => { + this.toastr.success('Users was successfully deleted!', 'Success!'); + this.getGroupsData(); + }, () => this.toastr.error('Failed users deleting!', 'Oops!')); + } else if ($event.type === 'group') { + console.log('delete group'); + this.rolesService.removeGroupById($event.value).subscribe(res => { + this.toastr.success('Group was successfully deleted!', 'Success!'); + this.getGroupsData(); + }, () => this.toastr.error('Failed group deleting!', 'Oops!')); + } + break; + default: + } + } + public extractIds(sourceList, target) { return sourceList.reduce((acc, item) => { target.includes(item.description) && acc.push(item._id); From 766d0f9fd4ce380a3452d2306e7f0a02f760bcc5 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:27:18 +0300 Subject: [PATCH 100/357] [DLAB-631]: moved manage roles functionality into separate page --- .../administration/administration.module.ts | 5 +- .../app/administration/management/index.ts | 7 -- .../management/management.component.html | 44 ++++----- .../management/management.component.ts | 92 +++++++++---------- .../webapp/src/app/app.routing.module.ts | 11 ++- 5 files changed, 77 insertions(+), 82 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/administration.module.ts b/services/self-service/src/main/resources/webapp/src/app/administration/administration.module.ts index 2ae70a45cc..e535bdaa5d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/administration.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/administration.module.ts @@ -22,10 +22,11 @@ import { CommonModule } from '@angular/common'; import { ManagenementModule } from './management'; import { ProjectModule } from './project'; +import { RolesModule } from './roles'; @NgModule({ - imports: [CommonModule, ManagenementModule, ProjectModule], + imports: [CommonModule, ManagenementModule, ProjectModule, RolesModule], declarations: [], - exports: [ManagenementModule, ProjectModule] + exports: [ManagenementModule, ProjectModule, RolesModule] }) export class AdministrationModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index f5146e47ec..3dadada5b0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -38,12 +38,10 @@ import { FormControlsModule } from '../../shared/form-controls'; import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; import { ManageEnvironmentComponent, ConfirmActionDialogComponent } from './manage-environment/manage-environment-dilog.component'; -import { GroupNameValidationDirective } from './manage-roles-groups/group-name-validarion.directive'; import { DirectivesModule } from '../../core/directives'; import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; import { EndpointsComponent } from './endpoints/endpoints.component'; -import { ManageRolesGroupsComponent, ConfirmDeleteUserAccountDialogComponent } from './manage-roles-groups/manage-roles-groups.component'; import { ProjectModule } from '../project'; export * from './management.component'; @@ -67,21 +65,16 @@ export * from './management.component'; declarations: [ ManagementComponent, ManagementGridComponent, - - GroupNameValidationDirective, BackupDilogComponent, ManageEnvironmentComponent, ConfirmationDialogComponent, ConfirmActionDialogComponent, - ConfirmDeleteUserAccountDialogComponent, SsnMonitorComponent, - ManageRolesGroupsComponent, EndpointsComponent ], entryComponents: [ ConfirmationDialogComponent, ConfirmActionDialogComponent, - ConfirmDeleteUserAccountDialogComponent, BackupDilogComponent, SsnMonitorComponent, EndpointsComponent, diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index fb159c2bea..cffca62916 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -18,33 +18,29 @@ -->
-
- - - - - -
- + + + +
+
- + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index bca392054f..e698281450 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -60,7 +60,7 @@ export class ManagementComponent implements OnInit, OnDestroy { @ViewChild('keyUploadModal') keyUploadDialog; @ViewChild('preloaderModal') preloaderDialog; @ViewChild('ssnMonitor') ssnMonitorDialog; - @ViewChild('rolesGroupsModal') rolesGroupsDialog; + // @ViewChild('rolesGroupsModal') rolesGroupsDialog; constructor( public toastr: ToastrService, @@ -111,7 +111,7 @@ export class ManagementComponent implements OnInit, OnDestroy { } showEndpointsDialog() { - this.dialog.open(EndpointsComponent, { panelClass: 'modal-sm' }) + this.dialog.open(EndpointsComponent, { panelClass: 'modal-xl-s' }) .afterClosed().subscribe(result => result && this.buildGrid()); } @@ -140,14 +140,14 @@ export class ManagementComponent implements OnInit, OnDestroy { () => this.toastr.error('Failed ssn data loading!', 'Oops!')); } - openManageRolesDialog() { - this.rolesService.getGroupsData().subscribe(group => { - this.rolesService.getRolesData().subscribe( - roles => this.rolesGroupsDialog.open({ isFooter: false }, group, roles), - error => this.toastr.error(error.message, 'Oops!')); - }, - error => this.toastr.error(error.message, 'Oops!')); - } + // openManageRolesDialog() { + // this.rolesService.getGroupsData().subscribe(group => { + // this.rolesService.getRolesData().subscribe( + // roles => this.rolesGroupsDialog.open({ isFooter: false }, group, roles), + // error => this.toastr.error(error.message, 'Oops!')); + // }, + // error => this.toastr.error(error.message, 'Oops!')); + // } isEnvironmentsInProgress(data): boolean { return data.exploratory.some(el => { @@ -169,37 +169,37 @@ export class ManagementComponent implements OnInit, OnDestroy { error => this.toastr.error(error.message, 'Oops!')); } - manageRolesGroups($event) { - switch ($event.action) { - case 'create': - this.rolesService.setupNewGroup($event.value).subscribe(res => { - this.toastr.success('Group creation success!', 'Created!'); - this.getGroupsData(); - }, () => this.toastr.error('Group creation failed!', 'Oops!')); - break; - case 'update': - this.rolesService.updateGroup($event.value).subscribe(res => { - this.toastr.success('Group data successfully updated!', 'Success!'); - this.getGroupsData(); - }, () => this.toastr.error('Failed group data updating!', 'Oops!')); - break; - case 'delete': - if ($event.type === 'users') { - this.rolesService.removeUsersForGroup($event.value).subscribe(res => { - this.toastr.success('Users was successfully deleted!', 'Success!'); - this.getGroupsData(); - }, () => this.toastr.error('Failed users deleting!', 'Oops!')); - } else if ($event.type === 'group') { - console.log('delete group'); - this.rolesService.removeGroupById($event.value).subscribe(res => { - this.toastr.success('Group was successfully deleted!', 'Success!'); - this.getGroupsData(); - }, () => this.toastr.error('Failed group deleting!', 'Oops!')); - } - break; - default: - } - } + // manageRolesGroups($event) { + // switch ($event.action) { + // case 'create': + // this.rolesService.setupNewGroup($event.value).subscribe(res => { + // this.toastr.success('Group creation success!', 'Created!'); + // this.getGroupsData(); + // }, () => this.toastr.error('Group creation failed!', 'Oops!')); + // break; + // case 'update': + // this.rolesService.updateGroup($event.value).subscribe(res => { + // this.toastr.success('Group data successfully updated!', 'Success!'); + // this.getGroupsData(); + // }, () => this.toastr.error('Failed group data updating!', 'Oops!')); + // break; + // case 'delete': + // if ($event.type === 'users') { + // this.rolesService.removeUsersForGroup($event.value).subscribe(res => { + // this.toastr.success('Users was successfully deleted!', 'Success!'); + // this.getGroupsData(); + // }, () => this.toastr.error('Failed users deleting!', 'Oops!')); + // } else if ($event.type === 'group') { + // console.log('delete group'); + // this.rolesService.removeGroupById($event.value).subscribe(res => { + // this.toastr.success('Group was successfully deleted!', 'Success!'); + // this.getGroupsData(); + // }, () => this.toastr.error('Failed group deleting!', 'Oops!')); + // } + // break; + // default: + // } + // } setBudgetLimits($event) { this.healthStatusService.updateUsersBudget($event.users).subscribe((result: any) => { @@ -212,11 +212,11 @@ export class ManagementComponent implements OnInit, OnDestroy { }, error => this.toastr.error(error.message, 'Oops!')); } - getGroupsData() { - this.rolesService.getGroupsData().subscribe( - list => this.rolesGroupsDialog.updateGroupData(list), - error => this.toastr.error(error.message, 'Oops!')); - } + // getGroupsData() { + // this.rolesService.getGroupsData().subscribe( + // list => this.rolesGroupsDialog.updateGroupData(list), + // error => this.toastr.error(error.message, 'Oops!')); + // } manageEnvironment(event: { action: string, user: string }) { this.healthStatusService diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts index dae0bd9445..5135e02ef4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts @@ -30,8 +30,9 @@ import { ReportingComponent } from './reporting/reporting.component'; import { WebterminalComponent } from './webterminal/webterminal.component'; import { ManagementComponent } from './administration/management/management.component'; import { ProjectComponent } from './administration/project/project.component'; +import { RolesComponent } from './administration/roles/roles.component'; -import { AuthorizationGuard, CheckParamsGuard, CloudProviderGuard } from './core/services'; +import { AuthorizationGuard, CheckParamsGuard, CloudProviderGuard, AdminGuard } from './core/services'; const routes: Routes = [{ path: 'login', @@ -56,11 +57,15 @@ const routes: Routes = [{ }, { path: 'projects', component: ProjectComponent, - canActivate: [AuthorizationGuard], + canActivate: [AuthorizationGuard, AdminGuard], + }, { + path: 'roles', + component: RolesComponent, + canActivate: [AuthorizationGuard, AdminGuard], }, { path: 'environment_management', component: ManagementComponent, - canActivate: [AuthorizationGuard] + canActivate: [AuthorizationGuard, AdminGuard] }, { path: 'terminal/:id', component: WebterminalComponent From 3c78764031a0b246d8b1981af9a95d7f2d010594 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:28:03 +0300 Subject: [PATCH 101/357] [DLAB-631]: added roles to navigation --- .../app/shared/navbar/navbar.component.html | 15 +++++--- .../app/shared/navbar/navbar.component.scss | 34 +++++++++++++------ 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 9afd109948..3fd92184e3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -83,15 +83,15 @@ List of Resources dashboard - + Administration - Environment Management - account_box + Roles + account_box Projects dns + + Environment Management + settings + Date: Thu, 30 May 2019 13:29:28 +0300 Subject: [PATCH 102/357] [DLAB-631]: added tabs with endpoints list --- .../endpoints/endpoints.component.html | 80 ++++++++++++++----- .../endpoints/endpoints.component.scss | 42 ++++++++++ 2 files changed, 104 insertions(+), 18 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html index c6c663b1ff..99404fc663 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html @@ -18,20 +18,24 @@ --> -
-
-

Create endpoint

- -
-
-
+
+
+

Create endpoint

+ +
+
+
+ +
- - Endpoint name can only contain letters, numbers, hyphens and '_' but can not end with special characters + + Endpoint name can only contain letters, numbers, hyphens and '_' but can not end with special + characters
@@ -39,8 +43,10 @@

Create endpoint

- - Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special characters + + Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special + characters
@@ -48,16 +54,54 @@

Create endpoint

- - Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special characters + + Endpoint account can only contain letters, numbers, hyphens and '_' but can not end with special + characters
-
+
- +
-
-
-
\ No newline at end of file + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
Endpoint name {{element.name}} Url {{element.url}} {{element.account}} + + delete_forever + +
+
+ + +
+
+
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss index 510f082c6f..9a49606bc7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss @@ -17,3 +17,45 @@ * under the License. */ +.content-box { + padding: 10px 30px 30px; + height: 380px; + display: flex; + flex-direction: column; + justify-content: space-between; + form { + padding: 20px 10px; + .control-group { + .error { + position: absolute; + right: 0; + bottom: 5px; + } + } + } + .action-group { + text-align: center; + } + .endpoints { + height: 265px; + table { + width: 100%; + .actions { + color: #607d8b; + width: 10%; + text-align: center; + span { + transition: all .5s ease-in-out; + cursor: pointer; + .mat-icon { + font-size: 18px; + padding-top: 5px; + } + &:hover { + color: darken(#607d8b, 10%); + } + } + } + } + } +} From 182e9c21fba785ba416d2b4ce9a18f139edfefb2 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:30:29 +0300 Subject: [PATCH 103/357] [DLAB-631]: added ability to delete endpoints with confirmation --- .../management/endpoints/endpoints.component.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts index 9ad5b976d8..da41791148 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts @@ -19,10 +19,11 @@ import { Component, OnInit, Inject } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import { EndpointService } from '../../../core/services'; +import { NotificationDialogComponent } from '../../../shared/modal-dialog/notification-dialog'; export interface Endpoint { name: string; @@ -39,11 +40,13 @@ export class EndpointsComponent implements OnInit { public createEndpointForm: FormGroup; namePattern = '[-_a-zA-Z0-9]+'; endpoints: Endpoint[] = []; + displayedColumns: string[] = ['name', 'url', 'account', 'actions']; constructor( @Inject(MAT_DIALOG_DATA) public data: any, public toastr: ToastrService, public dialogRef: MatDialogRef, + public dialog: MatDialog, private endpointService: EndpointService, private _fb: FormBuilder ) { } @@ -60,6 +63,16 @@ export class EndpointsComponent implements OnInit { }, error => this.toastr.error(error.message || 'Endpoint creation failed!', 'Oops!')); } + public deleteEndpoint(data) { + this.dialog.open(NotificationDialogComponent, { data: { type: 'confirmation', item: data }, panelClass: 'modal-sm' }) + .afterClosed().subscribe(result => { + result && this.endpointService.deleteEndpoint(data.name).subscribe(() => { + this.toastr.success('Endpoint successfully deleted!', 'Success!'); + this.getEndpointList(); + }, error => this.toastr.error(error.message || 'Endpoint creation failed!', 'Oops!')); + }); + } + private initFormModel(): void { this.createEndpointForm = this._fb.group({ name: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], From 8cee4bbccaa61c6a9bcad764f5d4b9fc37fea399 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 13:31:45 +0300 Subject: [PATCH 104/357] [DLAB-631]: tabs component fixes --- .../src/app/administration/project/project.component.html | 2 +- .../app/resources/manage-ungit/manage-ungit.component.html | 2 +- .../src/main/resources/webapp/src/assets/styles/_general.scss | 1 + .../self-service/src/main/resources/webapp/src/styles.scss | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index beabad0f3e..ed23dcfbf9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -31,8 +31,8 @@
- + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html index cca7629238..c8766ff671 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html @@ -22,7 +22,7 @@

Manage Git Credentials

-
+
+ +
loader

Initial infrastructure is being created,
please, wait...

- - - +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts index 5dc200a328..48f6cb5610 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts @@ -27,20 +27,8 @@ import { Component, OnInit, ViewChild, Input } from '@angular/core'; export class ProgressDialogComponent implements OnInit { @Input() theBoundCallback: Function; - @ViewChild('bindDialog') bindDialog; - ngOnInit() { if (this.theBoundCallback) this.theBoundCallback(); } - - open(params) { - if (!this.bindDialog.isOpened) - this.bindDialog.open(params); - } - - close() { - if (this.bindDialog.isOpened) - this.bindDialog.close(); - } } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 3fd92184e3..4bd0eaa5e7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -26,13 +26,6 @@ - @@ -127,4 +120,3 @@ - \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index 8efc7a78f7..7bf49a0c2d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -33,6 +33,7 @@ import { GeneralEnvironmentStatus } from '../../administration/management/manage import { DICTIONARY } from '../../../dictionary/global.dictionary'; import { HTTP_STATUS_CODES, FileUtils } from '../../core/util'; import { NotificationDialogComponent } from '../modal-dialog/notification-dialog'; +import { ProgressDialogComponent } from '../modal-dialog/progress-dialog'; @Component({ selector: 'dlab-navbar', @@ -59,7 +60,6 @@ export class NavbarComponent implements OnInit, OnDestroy { subscriptions: Subscription = new Subscription(); @ViewChild('keyUploadModal') keyUploadDialog; - @ViewChild('preloaderModal') preloaderDialog; constructor( public toastr: ToastrService, @@ -159,13 +159,15 @@ export class NavbarComponent implements OnInit, OnDestroy { } private processAccessKeyStatus(status: number): void { + debugger; if (status === HTTP_STATUS_CODES.NOT_FOUND || status === HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) { - this.preloaderDialog.bindDialog.isOpened && this.preloaderDialog.close(); + !this.dialog.openDialogs.length && this.dialog.closeAll(); + this.keyUploadDialog.open({ isFooter: false }); this.alive = false; this.lastStatus = status; } else if (status === HTTP_STATUS_CODES.ACCEPTED) { - !this.preloaderDialog.bindDialog.isOpened && this.preloaderDialog.open({ isHeader: false, isFooter: false }); + !this.dialog.openDialogs.length && this.dialog.open(ProgressDialogComponent, {panelClass: 'modal-xs'}); if (!this.alive) { this.alive = true; @@ -181,7 +183,7 @@ export class NavbarComponent implements OnInit, OnDestroy { this.lastStatus = false; } this.alive = false; - this.preloaderDialog.close(); + this.dialog.closeAll(); this.keyUploadDialog.close(); } } @@ -191,7 +193,7 @@ export class NavbarComponent implements OnInit, OnDestroy { if (list.length) { if (this.dialog.openDialogs.length > 0) return; const filteredData = this.groupSchedulerData(list); - const dialogRef: MatDialogRef = this.dialog.open(NotificationDialogComponent, { + this.dialog.open(NotificationDialogComponent, { data: { template: filteredData, type: 'list' }, width: '550px' }); From c5482594b5b44ceaedc71fff8292bf70ce7318ab Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 14:30:20 +0300 Subject: [PATCH 106/357] [DLAB-631]: replaced cost detail component with material --- .../src/app/administration/roles/roles.component.html | 9 +-------- .../computational-resource-create-dialog.component.html | 2 +- .../cost-details-dialog.component.html | 8 +++++--- .../cost-details-dialog.component.scss | 0 .../cost-details-dialog/cost-details-dialog.component.ts | 0 .../cost-details-dialog/index.ts | 3 +-- .../webapp/src/app/resources/resources-grid/index.ts | 2 +- .../resources-grid/resources-grid.component.html | 4 ++-- .../resources/resources-grid/resources-grid.component.ts | 5 ++--- .../webapp/src/app/shared/navbar/navbar.component.ts | 1 - .../main/resources/webapp/src/assets/styles/_theme.scss | 2 +- 11 files changed, 14 insertions(+), 22 deletions(-) rename services/self-service/src/main/resources/webapp/src/app/resources/{billing => exploratory}/cost-details-dialog/cost-details-dialog.component.html (93%) rename services/self-service/src/main/resources/webapp/src/app/resources/{billing => exploratory}/cost-details-dialog/cost-details-dialog.component.scss (100%) rename services/self-service/src/main/resources/webapp/src/app/resources/{billing => exploratory}/cost-details-dialog/cost-details-dialog.component.ts (100%) rename services/self-service/src/main/resources/webapp/src/app/resources/{billing => exploratory}/cost-details-dialog/index.ts (92%) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html index cade0b632e..778de7b29d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html @@ -17,12 +17,7 @@ ~ under the License. --> - -
+
@@ -157,5 +152,3 @@

Manage roles

- \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index bfe0b74474..6120083d10 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
+

Add computational resources

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html similarity index 93% rename from services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html index cf904f06be..700cc54f02 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html @@ -17,9 +17,11 @@ ~ under the License. --> -
-
-
+
+
+ +
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.scss rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.ts similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.ts rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/index.ts similarity index 92% rename from services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/index.ts index 11a0424276..b95c1838ae 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/index.ts @@ -22,12 +22,11 @@ import { CommonModule } from '@angular/common'; import { MaterialModule } from '../../../shared/material.module'; import { CostDetailsDialogComponent } from './cost-details-dialog.component'; -import { ModalModule } from '../../../shared'; export * from './cost-details-dialog.component'; @NgModule({ - imports: [CommonModule, ModalModule, MaterialModule], + imports: [CommonModule, MaterialModule], declarations: [CostDetailsDialogComponent], entryComponents: [CostDetailsDialogComponent], exports: [CostDetailsDialogComponent] diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts index ea94971221..27e4daa05c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts @@ -27,7 +27,7 @@ import { ModalModule, ConfirmationDialogModule, BubbleModule } from '../../share import { ComputationalResourceCreateDialogModule } from '../computational/computational-resource-create-dialog'; import { DetailDialogModule } from '../exploratory/detail-dialog'; import { FormControlsModule } from '../../shared/form-controls'; -import { CostDetailsDialogModule } from '../billing/cost-details-dialog'; +import { CostDetailsDialogModule } from '../exploratory/cost-details-dialog'; import { InstallLibrariesModule } from '../exploratory/install-libraries'; import { AmiCreateDialogModule } from '../exploratory/ami-create-dialog'; import { SchedulerModule } from '../scheduler'; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 2297b6c3bc..4126a520bc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -74,8 +74,8 @@ diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index bf08ec56ae..aa76c91eaa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -33,7 +33,7 @@ import { DetailDialogComponent } from '../exploratory/detail-dialog'; import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog'; import { InstallLibrariesComponent } from '../exploratory/install-libraries'; import { ComputationalResourceCreateDialogComponent } from '../computational/computational-resource-create-dialog/computational-resource-create-dialog.component'; -import { CostDetailsDialogComponent } from '../billing/cost-details-dialog'; +import { CostDetailsDialogComponent } from '../exploratory/cost-details-dialog'; import { SchedulerComponent } from '../scheduler'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @@ -287,8 +287,7 @@ export class ResourcesGridComponent implements OnInit { } printCostDetails(data): void { - // this.costDetailsDialog.open({ isFooter: false }, data); - this.dialog.open(CostDetailsDialogComponent, { data: data, panelClass: 'modal-lg' }) + this.dialog.open(CostDetailsDialogComponent, { data: data, panelClass: 'modal-xl' }) .afterClosed().subscribe(() => this.buildGrid()); } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index 7bf49a0c2d..df29f29879 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -159,7 +159,6 @@ export class NavbarComponent implements OnInit, OnDestroy { } private processAccessKeyStatus(status: number): void { - debugger; if (status === HTTP_STATUS_CODES.NOT_FOUND || status === HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) { !this.dialog.openDialogs.length && this.dialog.closeAll(); diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 14695e2057..b34ca96ffb 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -234,7 +234,7 @@ white-space: pre-line !important; word-break: break-all; } -.manage-roles-dialog, +.manage-roles, .project-form { .mat-form-field { width: 100%; From 17a9e7d52bc823a00d70ef465cacb9dac66b415b Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 15:58:16 +0300 Subject: [PATCH 107/357] [DLAB-631]: replaced confirmation dialog component --- .../app/administration/management/index.ts | 6 +-- .../management-grid.component.html | 1 - .../management-grid.component.ts | 25 +++++------ .../detail-dialog/detail-dialog.component.ts | 1 - .../resources-grid.component.html | 9 ---- .../resources-grid.component.ts | 21 +++------- .../confirmation-dialog.component.html | 26 ++++++------ .../confirmation-dialog.component.ts | 42 +++++++------------ .../modal-dialog/confirmation-dialog/index.ts | 1 + .../progress-dialog.component.ts | 8 +++- 10 files changed, 59 insertions(+), 81 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index 88b0e44532..329f1c20db 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -30,7 +30,7 @@ import { import { MaterialModule } from '../../shared/material.module'; import { ManagementComponent } from './management.component'; -import { ManagementGridComponent, ConfirmationDialogComponent } from './management-grid/management-grid.component'; +import { ManagementGridComponent, ReconfirmationDialogComponent } from './management-grid/management-grid.component'; import { ComputationalResourcesModule } from '../../resources/computational/computational-resources-list'; import { FormControlsModule } from '../../shared/form-controls'; @@ -65,13 +65,13 @@ export * from './management.component'; ManagementGridComponent, BackupDilogComponent, ManageEnvironmentComponent, - ConfirmationDialogComponent, + ReconfirmationDialogComponent, ConfirmActionDialogComponent, SsnMonitorComponent, EndpointsComponent ], entryComponents: [ - ConfirmationDialogComponent, + ReconfirmationDialogComponent, ConfirmActionDialogComponent, BackupDilogComponent, SsnMonitorComponent, diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index 6b8bb95c0e..8694e96fcf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -155,7 +155,6 @@
- {{ env.cost || 'N/A' }} {{env.currency_code || ''}} - + {{ env.cost || 'N/A' }} {{ env.currency_code || '' }} + help_outline
- \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts index 7cc28e82ae..0c630dfece 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts @@ -24,6 +24,7 @@ import { ToastrService } from 'ngx-toastr'; import { HealthStatusService, UserAccessKeyService } from '../../../core/services'; import { ConfirmationDialogType } from '../../../shared'; import { FileUtils } from '../../../core/util'; +import { ConfirmationDialogComponent } from '../../../shared/modal-dialog/confirmation-dialog/confirmation-dialog.component'; export interface ManageAction { action: string; @@ -51,7 +52,6 @@ export class ManagementGridComponent implements OnInit { @Output() refreshGrid: EventEmitter<{}> = new EventEmitter(); @Output() actionToggle: EventEmitter = new EventEmitter(); - @ViewChild('confirmationDialog') confirmationDialog; @ViewChild('keyReuploadDialog') keyReuploadDialog; constructor( @@ -71,7 +71,7 @@ export class ManagementGridComponent implements OnInit { toggleResourceAction(environment, action: string, resource?) { if (resource) { const resource_name = resource ? resource.computational_name : environment.name; - const dialogRef: MatDialogRef = this.dialog.open(ConfirmationDialogComponent, { + const dialogRef: MatDialogRef = this.dialog.open(ReconfirmationDialogComponent, { data: { action, resource_name, user: environment.user }, width: '550px', panelClass: 'error-modalbox' @@ -80,16 +80,17 @@ export class ManagementGridComponent implements OnInit { result && this.actionToggle.emit({ action, environment, resource }); }); } else { + const type = (environment.name === 'edge node' || environment.type.toLowerCase() === 'edge node') + ? ConfirmationDialogType.StopEdgeNode : ConfirmationDialogType.StopExploratory; + if (action === 'stop') { - this.confirmationDialog.open( - { isFooter: false }, - environment, - (environment.name === 'edge node' || environment.type.toLowerCase() === 'edge node') - ? ConfirmationDialogType.StopEdgeNode - : ConfirmationDialogType.StopExploratory, - ); + this.dialog.open(ConfirmationDialogComponent, { + data: { notebook: environment, type: type, manageAction: this.isAdmin }, panelClass: 'modal-md' + }); } else if (action === 'terminate') { - this.confirmationDialog.open({ isFooter: false }, environment, ConfirmationDialogType.TerminateExploratory); + this.dialog.open(ConfirmationDialogComponent, { + data: { notebook: environment, type: ConfirmationDialogType.TerminateExploratory, manageAction: this.isAdmin } + }); } else if (action === 'run') { this.healthStatusService .runEdgeNode() @@ -164,9 +165,9 @@ export class ManagementGridComponent implements OnInit { styles: [ ] }) -export class ConfirmationDialogComponent { +export class ReconfirmationDialogComponent { constructor( - public dialogRef: MatDialogRef, + public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any ) {} } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts index 8f75eeae37..81bffe3d84 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts @@ -56,7 +56,6 @@ export class DetailDialogComponent implements OnInit { } ngOnInit() { - // this.dialogRef.beforeClosed().subscribe(() => this.resetDialog()); this.notebook; if (this.notebook) { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 4126a520bc..2c4e497433 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -152,12 +152,3 @@ - - - - - - - - - diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index aa76c91eaa..6bf54027ff 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -18,7 +18,7 @@ */ /* tslint:disable:no-empty */ -import { Component, ViewChild, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; import { MatDialog } from '@angular/material'; @@ -34,6 +34,7 @@ import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog'; import { InstallLibrariesComponent } from '../exploratory/install-libraries'; import { ComputationalResourceCreateDialogComponent } from '../computational/computational-resource-create-dialog/computational-resource-create-dialog.component'; import { CostDetailsDialogComponent } from '../exploratory/cost-details-dialog'; +import { ConfirmationDialogComponent } from '../../shared/modal-dialog/confirmation-dialog'; import { SchedulerComponent } from '../scheduler'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @@ -52,7 +53,6 @@ export class ResourcesGridComponent implements OnInit { filterConfiguration: FilterConfigurationModel; filterForm: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); model = new CreateResourceModel('', ''); - notebookName: string; isOutscreenDropdown: boolean; collapseFilterRow: boolean = false; filtering: boolean = false; @@ -60,12 +60,6 @@ export class ResourcesGridComponent implements OnInit { healthStatus: GeneralEnvironmentStatus; delimitersRegex = /[-_]?/g; - // @ViewChild('computationalResourceModal') computationalResourceModal; - @ViewChild('confirmationDialog') confirmationDialog; - @ViewChild('detailDialog') detailDialog; - @ViewChild('costDetailsDialog') costDetailsDialog; - // @ViewChild('envScheduler') scheduler; - public filteringColumns: Array = [ { title: 'Environment name', name: 'name', className: 'th_name', filtering: {} }, { title: 'Status', name: 'statuses', className: 'th_status', filtering: {} }, @@ -281,7 +275,6 @@ export class ResourcesGridComponent implements OnInit { } printDetailEnvironmentModal(data): void { - // this.detailDialog.open({ isFooter: false }, data); this.dialog.open(DetailDialogComponent, { data: data, panelClass: 'modal-lg' }) .afterClosed().subscribe(() => this.buildGrid()); } @@ -293,9 +286,6 @@ export class ResourcesGridComponent implements OnInit { exploratoryAction(data, action: string) { if (action === 'deploy') { - this.notebookName = data.name; - // this.computationalResourceModal.open({ isFooter: false }, data, this.environments); - this.dialog.open(ComputationalResourceCreateDialogComponent, { data: { notebook: data, full_list: this.environments}, panelClass: 'modal-xxl'}) .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'run') { @@ -305,14 +295,15 @@ export class ResourcesGridComponent implements OnInit { () => this.buildGrid(), error => this.toastr.error(error.message || 'Exploratory starting failed!', 'Oops!')); } else if (action === 'stop') { - this.confirmationDialog.open({ isFooter: false }, data, ConfirmationDialogType.StopExploratory); + this.dialog.open(ConfirmationDialogComponent, { data: { notebook: data, type: ConfirmationDialogType.StopExploratory }, panelClass: 'modal-sm'}) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'terminate') { - this.confirmationDialog.open({ isFooter: false }, data, ConfirmationDialogType.TerminateExploratory); + this.dialog.open(ConfirmationDialogComponent, {data: { notebook: data, type: ConfirmationDialogType.TerminateExploratory }, panelClass: 'modal-sm'}) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'install') { this.dialog.open(InstallLibrariesComponent, { data: data, panelClass: 'modal-fullscreen' }) .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'schedule') { - // this.scheduler.open({ isFooter: false }, data, 'EXPLORATORY'); this.dialog.open(SchedulerComponent, { data: {notebook: data, type: 'EXPLORATORY'}, panelClass: 'modal-xl-s' }) .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'ami') { diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html index d9ba880fcf..a19d7736d2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html @@ -17,8 +17,8 @@ ~ under the License. --> - - +
+

{{ confirmationType ? 'Terminate' : 'Stop' }} notebook: {{ model.notebook.name }} @@ -27,12 +27,14 @@

priority_highWarning

- - + +

+

{{ model.title }}

-
Cluster
@@ -41,23 +43,23 @@

+ [hidden]="resource.status === 'failed' || resource.status === 'terminated' || resource.status === 'terminating' || (resource.status === 'stopped' && !confirmationType)">
{{ resource.computational_name }}
{{ (!confirmationType && resource.image === 'docker.dlab-dataengine') ? 'Stopped' : 'Terminated' }}
+ 'terminated': resource.image === 'docker.dlab-dataengine-service' || confirmationType }"> + {{ (!confirmationType && resource.image === 'docker.dlab-dataengine') ? 'Stopped' : 'Terminated' }}
{{ resource[DICTIONARY[resource.image].master_node_shape] }}

-

Do you want to proceed?

-

Are you sure you want to continue?

+

Do you want to proceed?

- +
- - +
+
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts index c1fe712276..fda9525457 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts @@ -17,8 +17,9 @@ * under the License. */ -import { Component, OnInit, ViewChild, Input, Output, EventEmitter, ViewEncapsulation } from '@angular/core'; +import { Component, OnInit, Inject, Input, Output, EventEmitter, ViewEncapsulation } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ConfirmationDialogModel } from './confirmation-dialog.model'; import { ConfirmationDialogType } from './confirmation-dialog-type.enum'; @@ -35,19 +36,22 @@ import { DICTIONARY } from '../../../../dictionary/global.dictionary'; export class ConfirmationDialogComponent implements OnInit { readonly DICTIONARY = DICTIONARY; + model: ConfirmationDialogModel; isAliveResources: boolean; onlyKilled: boolean = false; + notebook: any; dataengines: Array = []; dataengineServices: Array = []; confirmationType: number = 0; - @ViewChild('bindDialog') bindDialog; @Input() manageAction: boolean = false; @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef, private userResourceService: UserResourceService, private healthStatusService: HealthStatusService, private manageEnvironmentsService: ManageEnvironmentsService, @@ -57,38 +61,27 @@ export class ConfirmationDialogComponent implements OnInit { } ngOnInit() { - this.bindDialog.onClosing = () => this.resetDialog(); - } - - public open(param, notebook: any, type: ConfirmationDialogType) { - this.confirmationType = type; - - this.model = new ConfirmationDialogModel(type, notebook, + this.confirmationType = this.data.type; + this.notebook = this.data.notebook; + this.model = new ConfirmationDialogModel(this.confirmationType, this.notebook, response => { - if (response.status === HTTP_STATUS_CODES.OK) { - this.close(); - this.buildGrid.emit(); - } + if (response.status === HTTP_STATUS_CODES.OK) this.dialogRef.close(); }, error => this.toastr.error(error.message || 'Action failed!', 'Oops'), - this.manageAction, + this.data.manageAction, this.userResourceService, this.healthStatusService, this.manageEnvironmentsService); - this.bindDialog.open(param); - if (!this.confirmationType) this.filterResourcesByType(notebook.resources); - this.isAliveResources = this.model.isAliveResources(notebook.resources); - this.onlyKilled = notebook.resources ? !notebook.resources.some(el => el.status !== 'terminated') : false; + if (!this.confirmationType) this.filterResourcesByType(this.notebook.resources); + this.isAliveResources = this.model.isAliveResources(this.notebook.resources); + this.onlyKilled = this.notebook.resources ? !this.notebook.resources.some(el => el.status !== 'terminated') : false; } + public confirm() { this.model.confirmAction(); } - public close() { - this.bindDialog.close(); - } - private filterResourcesByType(resources) { resources .filter(resource => @@ -97,9 +90,4 @@ export class ConfirmationDialogComponent implements OnInit { .forEach(resource => { (resource.image === 'docker.dlab-dataengine') ? this.dataengines.push(resource) : this.dataengineServices.push(resource); }); } - - private resetDialog(): void { - this.dataengines = []; - this.dataengineServices = []; - } } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts index 2790f28f37..331a072e6d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts @@ -30,6 +30,7 @@ export * from './confirmation-dialog-type.enum'; @NgModule({ imports: [CommonModule, ModalModule, MaterialModule], declarations: [ConfirmationDialogComponent], + entryComponents: [ConfirmationDialogComponent], exports: [ConfirmationDialogComponent] }) export class ConfirmationDialogModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts index 48f6cb5610..9e2c7adc8c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/progress-dialog/progress-dialog.component.ts @@ -17,7 +17,8 @@ * under the License. */ -import { Component, OnInit, ViewChild, Input } from '@angular/core'; +import { Component, OnInit, Input, Inject } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; @Component({ selector: 'progress-dialog', @@ -27,6 +28,11 @@ import { Component, OnInit, ViewChild, Input } from '@angular/core'; export class ProgressDialogComponent implements OnInit { @Input() theBoundCallback: Function; + constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef, + ) { } + ngOnInit() { if (this.theBoundCallback) this.theBoundCallback(); From 942299288cecf75e20f3d9bcaf5e88c03ad602f8 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 16:07:14 +0300 Subject: [PATCH 108/357] [DLAB-631]: replaced key uploading dialog component --- .../management-grid.component.html | 4 +- .../modal-dialog/key-upload-dialog/index.ts | 1 + .../key-upload-dialog.component.html | 13 +++---- .../key-upload-dialog.component.ts | 38 +++++++------------ .../app/shared/navbar/navbar.component.html | 4 +- 5 files changed, 25 insertions(+), 35 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index 8694e96fcf..4998f464c4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -154,7 +154,7 @@ - + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts index 58093d89d6..9d165c5daf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts @@ -29,6 +29,7 @@ export * from './key-upload-dialog.component'; @NgModule({ imports: [CommonModule, ModalModule, MaterialModule], declarations: [UploadKeyDialogComponent], + entryComponents: [UploadKeyDialogComponent], exports: [UploadKeyDialogComponent] }) export class UploadKeyDialogModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html index 10eb2d6e27..ed417925dc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html @@ -17,14 +17,14 @@ ~ under the License. --> - - + diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts index ba4f7a4384..34ca90823c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts @@ -17,8 +17,9 @@ * under the License. */ -import { Component, OnInit, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { Component, OnInit, EventEmitter, Input, Output, ViewChild, Inject } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { KeyUploadDialogModel } from './key-upload.model'; import { UserAccessKeyService } from '../../../core/services'; @@ -33,12 +34,13 @@ export class UploadKeyDialogComponent implements OnInit { model: KeyUploadDialogModel; @Input() primaryUploading: boolean = true; - @ViewChild('bindDialog') bindDialog; @ViewChild('userAccessKeyUploadControl') userAccessKeyUploadControl; @Output() checkInfrastructureCreationProgress: EventEmitter<{}> = new EventEmitter(); @Output() generateUserKey: EventEmitter<{}> = new EventEmitter(); constructor( + @Inject(MAT_DIALOG_DATA) public data: any, + public dialogRef: MatDialogRef, private userAccessKeyService: UserAccessKeyService, public toastr: ToastrService ) { @@ -46,7 +48,15 @@ export class UploadKeyDialogComponent implements OnInit { } ngOnInit() { - this.bindDialog.onClosing = () => this.resetDialog(); + this.model = new KeyUploadDialogModel(null, + response => { + if (response.status === HTTP_STATUS_CODES.OK) { + this.close(); + this.checkInfrastructureCreationProgress.emit(); + } + }, + error => this.toastr.error(error.message, 'Oops!'), + this.userAccessKeyService); } public uploadUserAccessKey_onChange($event) { @@ -66,27 +76,7 @@ export class UploadKeyDialogComponent implements OnInit { return false; } - public open(params) { - if (!this.bindDialog.isOpened) { - this.model = new KeyUploadDialogModel(null, - response => { - if (response.status === HTTP_STATUS_CODES.OK) { - this.close(); - this.checkInfrastructureCreationProgress.emit(); - } - }, - error => this.toastr.error(error.message, 'Oops!'), - this.userAccessKeyService); - this.bindDialog.open(params); - } - } - public close() { - if (this.bindDialog.isOpened) - this.bindDialog.close(); - } - - private resetDialog(): void { - this.userAccessKeyUploadControl.nativeElement.value = ''; + this.dialogRef.close(); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 4bd0eaa5e7..bb3c059640 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -118,5 +118,5 @@ - + From 35c078a314aea9aaf0c04854b95bf7e160a2638e Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 30 May 2019 16:33:04 +0300 Subject: [PATCH 109/357] [DLAB-631]: removed old primitive dialog coponent --- .../app/administration/management/index.ts | 8 +- .../src/app/reporting/reporting.module.ts | 4 - .../computational/cluster-details/index.ts | 3 +- .../index.ts | 2 - .../computational-resources-list/index.ts | 2 - .../exploratory/ami-create-dialog/index.ts | 2 - .../exploratory/install-libraries/index.ts | 3 +- .../src/app/resources/resources-grid/index.ts | 3 +- .../src/app/resources/resources.module.ts | 8 - .../src/app/resources/scheduler/index.ts | 3 +- .../resources/webapp/src/app/shared/index.ts | 1 - .../confirmation-dialog.component.ts | 3 +- .../modal-dialog/confirmation-dialog/index.ts | 3 +- .../src/app/shared/modal-dialog/index.ts | 61 ---- .../modal-dialog/key-upload-dialog/index.ts | 3 +- .../shared/modal-dialog/modal.component.html | 42 --- .../shared/modal-dialog/modal.component.scss | 260 ------------------ .../shared/modal-dialog/modal.component.ts | 111 -------- .../modal-dialog/notification-dialog/index.ts | 3 +- .../webapp/src/app/shared/navbar/index.ts | 3 +- .../src/app/shared/navbar/navbar.component.ts | 6 +- 21 files changed, 12 insertions(+), 522 deletions(-) delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/index.ts delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index 329f1c20db..58d4b5d390 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -21,12 +21,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { - ModalModule, - UploadKeyDialogModule, - BubbleModule, - ConfirmationDialogModule -} from '../../shared'; +import { UploadKeyDialogModule, BubbleModule, ConfirmationDialogModule } from '../../shared'; import { MaterialModule } from '../../shared/material.module'; import { ManagementComponent } from './management.component'; @@ -51,7 +46,6 @@ export * from './management.component'; FormsModule, ReactiveFormsModule, ProjectModule, - ModalModule, UploadKeyDialogModule, BubbleModule, ConfirmationDialogModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts index 37e9bb05b0..3067e9ae4e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts @@ -25,7 +25,6 @@ import { NgDateRangePickerModule } from 'ng-daterangepicker'; import { MaterialModule } from '../shared/material.module'; import { FormControlsModule } from '../shared/form-controls'; import { ReportingComponent } from './reporting.component'; -import { ModalModule, UploadKeyDialogModule, ProgressDialogModule } from '../shared'; import { KeysPipeModule, LineBreaksPipeModule } from '../core/pipes'; import { ReportingGridComponent } from './reporting-grid/reporting-grid.component'; import { ToolbarComponent } from './toolbar/toolbar.component'; @@ -33,14 +32,11 @@ import { ToolbarComponent } from './toolbar/toolbar.component'; @NgModule({ imports: [ CommonModule, - ModalModule, FormsModule, FormControlsModule, KeysPipeModule, LineBreaksPipeModule, NgDateRangePickerModule, - UploadKeyDialogModule, - ProgressDialogModule, MaterialModule ], declarations: [ diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts index 25e12a3123..88bfff6ea2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts @@ -21,14 +21,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { ModalModule } from '../../../shared'; import { MaterialModule } from '../../../shared/material.module'; import { DetailComputationalResourcesComponent } from './cluster-details.component'; export * from './cluster-details.component'; @NgModule({ - imports: [CommonModule, ModalModule, FormsModule, ReactiveFormsModule, MaterialModule], + imports: [CommonModule, FormsModule, ReactiveFormsModule, MaterialModule], declarations: [DetailComputationalResourcesComponent], entryComponents: [DetailComputationalResourcesComponent], exports: [DetailComputationalResourcesComponent], diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts index 6098623260..5b449b420a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts @@ -21,7 +21,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { ModalModule } from '../../../shared/modal-dialog'; import { MaterialModule } from '../../../shared/material.module'; import { FormControlsModule } from '../../../shared/form-controls'; import { ComputationalResourceCreateDialogComponent } from './computational-resource-create-dialog.component'; @@ -29,7 +28,6 @@ import { ComputationalResourceCreateDialogComponent } from './computational-reso @NgModule({ imports: [ CommonModule, - ModalModule, FormsModule, ReactiveFormsModule, FormControlsModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/index.ts index be798a8ddb..abdb7dd503 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/index.ts @@ -21,7 +21,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MaterialModule } from '../../../shared/material.module'; -import { ModalModule } from '../../../shared'; import { ComputationalResourcesListComponent, ConfirmationDialogComponent } from './computational-resources-list.component'; import { DetailComputationalResourcesModule } from '../cluster-details'; import { SchedulerModule } from '../../scheduler'; @@ -31,7 +30,6 @@ export * from './computational-resources-list.component'; @NgModule({ imports: [ CommonModule, - ModalModule, DetailComputationalResourcesModule, SchedulerModule, MaterialModule diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts index 93b8f503ab..bc00c975bf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts @@ -22,14 +22,12 @@ import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../../shared/material.module'; -import { ModalModule } from '../../../shared'; import { AmiCreateDialogComponent } from './ami-create-dialog.component'; export * from './ami-create-dialog.component'; @NgModule({ imports: [ CommonModule, - ModalModule, MaterialModule, FormsModule, ReactiveFormsModule diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts index 427cd97a18..526aab46c0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts @@ -22,7 +22,7 @@ import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../../shared/material.module'; -import { ModalModule, BubbleModule } from '../../../shared'; +import { BubbleModule } from '../../../shared'; import { FormControlsModule } from '../../../shared/form-controls'; import { KeysPipeModule, LibSortPipeModule, HighLightPipeModule } from '../../../core/pipes'; @@ -34,7 +34,6 @@ export * from './install-libraries.component'; CommonModule, FormsModule, ReactiveFormsModule, - ModalModule, KeysPipeModule, LibSortPipeModule, HighLightPipeModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts index 27e4daa05c..39a9732164 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts @@ -23,7 +23,7 @@ import { RouterModule } from '@angular/router'; import { MaterialModule } from '../../shared/material.module'; import { ResourcesGridComponent } from './resources-grid.component'; import { ComputationalResourcesModule } from '../computational/computational-resources-list'; -import { ModalModule, ConfirmationDialogModule, BubbleModule } from '../../shared'; +import { ConfirmationDialogModule, BubbleModule } from '../../shared'; import { ComputationalResourceCreateDialogModule } from '../computational/computational-resource-create-dialog'; import { DetailDialogModule } from '../exploratory/detail-dialog'; import { FormControlsModule } from '../../shared/form-controls'; @@ -38,7 +38,6 @@ import { UnderscorelessPipeModule } from '../../core/pipes/underscoreless-pipe'; CommonModule, RouterModule, ComputationalResourcesModule, - ModalModule, ConfirmationDialogModule, BubbleModule, DetailDialogModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts index 2e0bbce94c..4c5f96b1b5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts @@ -27,21 +27,13 @@ import { ResourcesGridModule } from './resources-grid'; import { ExploratoryEnvironmentCreateModule } from './exploratory/exploratory-environment-create-dialog'; import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; import { ConfirmDeleteAccountDialog } from './manage-ungit/manage-ungit.component'; -import { - ModalModule, - ProgressDialogModule, - UploadKeyDialogModule -} from '../shared'; @NgModule({ imports: [ CommonModule, - ModalModule, FormsModule, ReactiveFormsModule, ResourcesGridModule, - ProgressDialogModule, - UploadKeyDialogModule, ExploratoryEnvironmentCreateModule, MaterialModule ], diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts index b2d76838da..30dad18b26 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts @@ -22,7 +22,7 @@ import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../shared/material.module'; -import { ModalModule, BubbleModule } from '../../shared'; +import { BubbleModule } from '../../shared'; import { FormControlsModule } from '../../shared/form-controls'; import { SchedulerComponent } from './scheduler.component'; import { TimePickerModule } from '../../shared/time-picker'; @@ -35,7 +35,6 @@ export * from './scheduler.model'; CommonModule, FormsModule, ReactiveFormsModule, - ModalModule, FormControlsModule, MaterialModule, BubbleModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/index.ts index 9bcd6cd3cf..5141d404b3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/index.ts @@ -17,7 +17,6 @@ * under the License. */ -export * from './modal-dialog'; export * from './modal-dialog/confirmation-dialog'; export * from './modal-dialog/progress-dialog'; export * from './modal-dialog/key-upload-dialog'; diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts index fda9525457..3ba0214a17 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts @@ -22,7 +22,6 @@ import { ToastrService } from 'ngx-toastr'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ConfirmationDialogModel } from './confirmation-dialog.model'; -import { ConfirmationDialogType } from './confirmation-dialog-type.enum'; import { UserResourceService, HealthStatusService, ManageEnvironmentsService } from '../../../core/services'; import { HTTP_STATUS_CODES } from '../../../core/util'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; @@ -30,7 +29,7 @@ import { DICTIONARY } from '../../../../dictionary/global.dictionary'; @Component({ selector: 'confirmation-dialog', templateUrl: 'confirmation-dialog.component.html', - styleUrls: ['./confirmation-dialog.component.scss', '../modal.component.scss'], + styleUrls: ['./confirmation-dialog.component.scss'], encapsulation: ViewEncapsulation.None }) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts index 331a072e6d..a0a46055ab 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts @@ -20,7 +20,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ModalModule } from '..'; import { ConfirmationDialogComponent } from './confirmation-dialog.component'; import { MaterialModule } from '../../material.module'; @@ -28,7 +27,7 @@ export * from './confirmation-dialog.component'; export * from './confirmation-dialog-type.enum'; @NgModule({ - imports: [CommonModule, ModalModule, MaterialModule], + imports: [CommonModule, MaterialModule], declarations: [ConfirmationDialogComponent], entryComponents: [ConfirmationDialogComponent], exports: [ConfirmationDialogComponent] diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/index.ts deleted file mode 100644 index cb3835b625..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/index.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { CommonModule } from '@angular/common'; -import { NgModule, Component } from '@angular/core'; - -import { MaterialModule } from '../material.module'; -import { ModalComponent } from './modal.component'; - -export * from './modal.component'; - -@Component({ - selector: 'modal-header', - template: `` -}) -export class ModalHeaderComponent {} - -@Component({ - selector: 'modal-content', - template: `` -}) -export class ModalContentComponent {} - -@Component({ - selector: 'modal-footer', - template: `` -}) -export class ModalFooterComponent {} - -@NgModule({ - imports: [CommonModule, MaterialModule], - declarations: [ - ModalComponent, - ModalHeaderComponent, - ModalContentComponent, - ModalFooterComponent - ], - exports: [ - ModalComponent, - ModalHeaderComponent, - ModalContentComponent, - ModalFooterComponent - ] -}) -export class ModalModule {} diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts index 9d165c5daf..9531f32a0b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts @@ -20,14 +20,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ModalModule } from '..'; import { UploadKeyDialogComponent } from './key-upload-dialog.component'; import { MaterialModule } from '../../material.module'; export * from './key-upload-dialog.component'; @NgModule({ - imports: [CommonModule, ModalModule, MaterialModule], + imports: [CommonModule, MaterialModule], declarations: [UploadKeyDialogComponent], entryComponents: [UploadKeyDialogComponent], exports: [UploadKeyDialogComponent] diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html deleted file mode 100644 index bb7bac2094..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html +++ /dev/null @@ -1,42 +0,0 @@ - - - diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss deleted file mode 100644 index 6a6fc02b1b..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss +++ /dev/null @@ -1,260 +0,0 @@ -/*! - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** Keyframes **/ -@keyframes show { - from { opacity: 0; transform: translateY(-25%); } - 20% { opacity: 0; transform: translateY(-20%); } - to { opacity: 1; transform: translateY(0%); } -} -@keyframes hide { - from { opacity: 1; transform: translateY(0%); } - 35% { opacity: 0; transform: translateY(-20%)} - to { opacity: 0; transform: translateY(-25%); } -} -@keyframes showSlideSide { - from { opacity: 0; transform: translateX(150%); } - 35% { opacity: 0; transform: translateX(100%); } - to { opacity: 1; transform: translateX(0%); } -} -@keyframes hideSlideSide { - from { opacity: 1; transform: translateX(0%); } - 35% { opacity: 0; } - to { opacity: 0; transform: translateX(150%); } -} - -.modal-xs { width: 375px; } -.modal-sm { width: 525px; } -.modal-md { width: 545px; } -.modal-lg { width: 580px; } -.modal-xl-s { width: 660px; } -.modal-xl { width: 900px; } -.modal-xxl { width: 1000px; } - -.backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 5; - background-color: #000; - transition: .3s ease-in-out; - opacity: .5; - filter: alpha(opacity=50); -} - -.dialog { - color: #718ba6; - font-size: 14px; - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 10; - overflow: hidden; - -webkit-overflow-scrolling: touch; - justify-content: center; - outline: 0; -} -.dialog:not(.in) { - visibility: hidden; -} -.dialog.in { - visibility: visible; - display: flex -} - -.dialog.in .dialog-container { - animation-duration: .35s; - animation-fill-mode: forwards; - animation-name: show; - animation-timing-function: ease; -} - -.dialog.out .dialog-container { - animation-duration: .35s; - animation-fill-mode: forwards; - animation-name: hide; - animation-timing-function: ease; -} - -/* .dialog.in .dialog-container.install-libs { - animation-duration: .35s; - animation-fill-mode: forwards; - animation-name: showSlideSide; - animation-timing-function: ease; - width: 100%; -} - -.dialog.in .dialog-container.install-libs .dialog-content { - height: 100vh; - width: 100%; -} - -.dialog.out .dialog-container.install-libs { - animation-duration: .25s; - animation-fill-mode: forwards; - animation-name: hideSlideSide; - animation-timing-function: ease; -} */ - -.dialog.in .dialog-container.install-libraries { - animation-duration: .35s; - animation-fill-mode: forwards; - animation-name: showSlideSide; - animation-timing-function: ease; - width: 100%; - height: 100%; -} - -.dialog.in .dialog-container.install-libraries .dialog-content { - width: 100%; - height: 100%; -} -.install-libraries .dialog-body { - height: calc(100% - 50px); -} -.install-libraries .mat-tab-body-wrapper { - flex-grow: 1; -} - -.install-libraries .mat-tab-body { - display: flex !important; - flex-direction: column; -} - -.install-libraries .mat-tab-body-content { - display: flex; - flex-direction: column; - flex-grow: 1; - height: 100%; -} -.install-libraries .dialog-body .content-box { - padding: 35px 50px 45px; - height: 100%; -} - -.dialog.out .dialog-container.install-libraries { - animation-duration: .35s; - animation-fill-mode: forwards; - animation-name: hideSlideSide; - animation-timing-function: ease; -} - -.dialog-container { - flex-direction: column; - align-items: center; - align-self: center; - list-style: none; - padding: 0; - margin: 0; - transition: all .35s linear .2s; -} - - - -.modal-footer .btn { - margin-top: 0; -} - - - -.detail-header { - border-bottom: 0; - width: 100%; - border-collapse: collapse; - table-layout: fixed; - td { - border: 1px solid #edf1f5; - text-align: center; - padding: 20px; - text-align: center !important; - background: #fff; - &:first-child { - background: #f6fafe; - font-size: 16px; - font-weight: 600; - color: #455c74; - text-overflow: ellipsis; - overflow: hidden; - cursor: default; - } - &.tooltip-wrap { - .hint-title { - font-size: 16px; - font-weight: 600; - color: #455c74; - overflow: hidden; - text-overflow: ellipsis; - } - } - } -} - -.detail-info { - p { - font-weight: 400; - margin-bottom: 10px; - small { - font-size: 12px; - font-weight: 400; - } - } - span { - font-size: 14px; - overflow: hidden; - text-overflow: ellipsis; - display: block; - } - .links_block { - padding-left: 25px; - } - .time_info { - margin-top: 15px; - } -} - -.create-cluster { - .dialog-header { - padding-left: 45px !important; - } -} - -.modal-content { - display: block; - position: relative; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid rgba(0,0,0,.2); - border-radius: 3px; - outline: 0; - -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); - box-shadow: 0 3px 9px rgba(0,0,0,.5); - .danger_color { - padding-left: 5px; - font-size: 12px; - display: inline-block; - font-family: 'Open Sans', sans-serif; - font-weight: 300; - border-color: #d9534f !important; - } -} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.ts deleted file mode 100644 index d6a16656f4..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.ts +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { Component, OnDestroy, Input, Output, EventEmitter, ElementRef, ViewChild, ViewEncapsulation } from '@angular/core'; - -@Component({ - selector: 'modal-dialog', - templateUrl: 'modal.component.html', - styleUrls: ['./modal.component.scss'], - encapsulation: ViewEncapsulation.None -}) - -export class ModalComponent implements OnDestroy { - - isOpened: boolean = false; - isHeader: boolean = true; - isFooter: boolean = true; - onClosing: Function; - isHide: boolean; - clear: number; - - @Input() modalClass: string; - @Input() title: string; - @Input() cancelButtonLabel: string; - @Input() submitButtonLabel: string; - @Input() hideCloseButton: boolean = false; - @Input() closeOnEscape: boolean = true; - - @Output() onOpen = new EventEmitter(false); - @Output() onClose = new EventEmitter(false); - @Output() onSubmit = new EventEmitter(false); - - @ViewChild('modalRoot') el: ElementRef; - - private backdropElement: HTMLElement; - - constructor() { - this.createBackDrop(); - } - - closeOnOutsideClick($event): boolean { - return ($event.target && $event.target.id === 'modalRoot'); - } - - ngOnDestroy() { - document.body.className = document.body.className.replace(/modal-open\b/, ''); - if (this.backdropElement && this.backdropElement.parentNode === document.body) - document.body.removeChild(this.backdropElement); - } - - public open(option: Object, ...args: any[]): void { - if (this.isOpened) - return; - - if (option) { - for (const key in option) { - this[key] = option[key]; - } - } - - this.isOpened = true; - this.isHide = false; - this.onOpen.emit(args); - document.body.appendChild(this.backdropElement); - window.setTimeout(() => this.el.nativeElement.focus(), 0); - document.body.className += ' modal-open'; - } - - public close(...args: any[]): void { - if (!this.isOpened) - return; - - if (this.onClosing) - this.onClosing(); - this.onClose.emit(args); - - this.isHide = true; - this.clear = window.setTimeout(() => { - document.body.contains(this.backdropElement) && document.body.removeChild(this.backdropElement); - document.body.className = document.body.className.replace(/modal-open\b/, ''); - this.el.nativeElement.classList.remove('out'); - this.isOpened = false; - - clearTimeout(this.clear); - }, 300); - - if (document.getElementsByClassName('dropdown open').length) - document.getElementsByClassName('dropdown open')[0].classList.remove('open'); - } - - private createBackDrop() { - this.backdropElement = document.createElement('div'); - this.backdropElement.classList.add('backdrop'); - } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/index.ts index 4daec02731..7f66ebc2be 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/index.ts @@ -20,14 +20,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ModalModule } from '..'; import { NotificationDialogComponent } from './notification-dialog.component'; import { MaterialModule } from '../../material.module'; export * from './notification-dialog.component'; @NgModule({ - imports: [CommonModule, ModalModule, MaterialModule], + imports: [CommonModule, MaterialModule], declarations: [NotificationDialogComponent], entryComponents: [NotificationDialogComponent], exports: [NotificationDialogComponent] diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts index 121e255a6e..539970a90c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts @@ -21,7 +21,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { MaterialModule } from '../material.module'; -import { ModalModule, UploadKeyDialogModule, ProgressDialogModule, BubbleModule } from '../index'; +import { UploadKeyDialogModule, ProgressDialogModule, BubbleModule } from '../index'; import { NavbarComponent } from './navbar.component'; import { NotificationDialogModule } from '../modal-dialog/notification-dialog'; @@ -34,7 +34,6 @@ export * from './navbar.component'; RouterModule, MaterialModule, NotificationDialogModule, - ModalModule, UploadKeyDialogModule, ProgressDialogModule, BubbleModule diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index df29f29879..4c333f8862 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -59,8 +59,6 @@ export class NavbarComponent implements OnInit, OnDestroy { healthStatus: GeneralEnvironmentStatus; subscriptions: Subscription = new Subscription(); - @ViewChild('keyUploadModal') keyUploadDialog; - constructor( public toastr: ToastrService, private applicationSecurityService: ApplicationSecurityService, @@ -162,7 +160,7 @@ export class NavbarComponent implements OnInit, OnDestroy { if (status === HTTP_STATUS_CODES.NOT_FOUND || status === HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) { !this.dialog.openDialogs.length && this.dialog.closeAll(); - this.keyUploadDialog.open({ isFooter: false }); + // this.keyUploadDialog.open({ isFooter: false }); this.alive = false; this.lastStatus = status; } else if (status === HTTP_STATUS_CODES.ACCEPTED) { @@ -183,7 +181,7 @@ export class NavbarComponent implements OnInit, OnDestroy { } this.alive = false; this.dialog.closeAll(); - this.keyUploadDialog.close(); + // this.keyUploadDialog.close(); } } From 8f60582f1177e8492705d911eceb51d158d281cc Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 28 May 2019 11:54:29 +0300 Subject: [PATCH 110/357] DLAB-654 added possibility to define project for analytical tool --- .../com/epam/dlab/dto/UserInstanceDTO.java | 7 ++ .../dto/exploratory/ExploratoryBaseDTO.java | 71 +++++++++++-------- .../java/com/epam/dlab/auth/UserInfo.java | 6 +- services/self-service/self-service.yml | 11 ++- .../auth/SelfServiceSecurityAuthorizer.java | 2 +- .../backendapi/dao/aws/AwsBillingDAO.java | 2 +- .../backendapi/dao/azure/AzureBillingDAO.java | 2 +- .../dlab/backendapi/domain/ProjectDTO.java | 2 +- .../resources/ExploratoryResource.java | 4 +- .../InfrastructureTemplateResource.java | 19 +++-- .../aws/ComputationalResourceAws.java | 14 ++-- .../azure/ComputationalResourceAzure.java | 12 ++-- .../dto/ComputationalCreateFormDTO.java | 4 ++ .../dto/ExploratoryCreateFormDTO.java | 12 ++++ .../gcp/ComputationalResourceGcp.java | 16 +++-- .../epam/dlab/backendapi/roles/UserRoles.java | 25 ++++--- .../InfrastructureTemplateService.java | 4 +- .../service/impl/ExploratoryServiceImpl.java | 7 +- .../InfrastructureTemplateServiceBase.java | 35 ++++++--- .../resources/ExploratoryResourceTest.java | 5 +- .../InfrastructureTemplateResourceTest.java | 36 +++++----- .../dlab/backendapi/roles/UserRolesTest.java | 16 ++--- ...InfrastructureTemplateServiceBaseTest.java | 27 ++++--- 23 files changed, 212 insertions(+), 127 deletions(-) diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java index a4a3e4721b..8cbfadb488 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java @@ -51,6 +51,8 @@ public class UserInstanceDTO { private String imageName; @JsonProperty("version") private String imageVersion; + @JsonProperty("version") + private String project; @JsonProperty("template_name") private String templateName; @JsonProperty @@ -145,6 +147,11 @@ public UserInstanceDTO withShape(String shape) { return this; } + public UserInstanceDTO withProject(String project) { + setProject(project); + return this; + } + /** * Sets a list of user's computational resources for notebook. */ diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryBaseDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryBaseDTO.java index fe97f9561e..1c68c758f2 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryBaseDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryBaseDTO.java @@ -24,32 +24,47 @@ import com.google.common.base.MoreObjects.ToStringHelper; public class ExploratoryBaseDTO> extends ResourceEnvBaseDTO { - @SuppressWarnings("unchecked") - private final T self = (T) this; - @JsonProperty("notebook_image") - private String notebookImage; - - public String getNotebookImage() { - return notebookImage; - } - - public void setNotebookImage(String notebookImage) { - this.notebookImage = notebookImage; - } - - public T withNotebookImage(String notebookImage) { - setNotebookImage(notebookImage); - return self; - } - - @Override - public ToStringHelper toStringHelper(Object self) { - return super.toStringHelper(self) - .add("notebookImage", notebookImage); - } - - @Override - public String toString() { - return toStringHelper(this).toString(); - } + @SuppressWarnings("unchecked") + private final T self = (T) this; + @JsonProperty("notebook_image") + private String notebookImage; + @JsonProperty("project") + private String project; + + public String getNotebookImage() { + return notebookImage; + } + + public void setNotebookImage(String notebookImage) { + this.notebookImage = notebookImage; + } + + public T withNotebookImage(String notebookImage) { + setNotebookImage(notebookImage); + return self; + } + + public T withProject(String project) { + setProject(project); + return self; + } + + @Override + public ToStringHelper toStringHelper(Object self) { + return super.toStringHelper(self) + .add("notebookImage", notebookImage); + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + @Override + public String toString() { + return toStringHelper(this).toString(); + } } diff --git a/services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/UserInfo.java b/services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/UserInfo.java index 8668a91ff3..b0c05bfdd1 100644 --- a/services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/UserInfo.java +++ b/services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/UserInfo.java @@ -67,7 +67,7 @@ public String getAccessToken() { } @JsonProperty("roles") - public Collection getRoles() { + public Set getRoles() { return roles; } @@ -121,6 +121,8 @@ public UserInfo withToken(String token) { return newInfo; } + + public boolean isAwsUser() { return awsUser; } @@ -161,6 +163,8 @@ public boolean equals(Object o) { } + + @Override public int hashCode() { return Objects.hash(username, diff --git a/services/self-service/self-service.yml b/services/self-service/self-service.yml index 855950db61..0f2dcc1b5f 100644 --- a/services/self-service/self-service.yml +++ b/services/self-service/self-service.yml @@ -81,7 +81,7 @@ server: - type: https port: 8443 certAlias: dlab - validateCerts: true + validateCerts: false keyStorePath: ${KEY_STORE_PATH} keyStorePassword: ${KEY_STORE_PASSWORD} trustStorePath: ${TRUST_STORE_PATH} @@ -92,7 +92,7 @@ server: - type: https port: 8444 certAlias: dlab - validateCerts: true + validateCerts: false keyStorePath: ${KEY_STORE_PATH} keyStorePassword: ${KEY_STORE_PASSWORD} trustStorePath: ${TRUST_STORE_PATH} @@ -105,6 +105,7 @@ logging: loggers: com.epam: TRACE com.novemberain: ERROR + io.swagger.v3: DEBUG appenders: <#if DEV_MODE == "true"> - type: console @@ -157,8 +158,12 @@ schedulers: enabled: true cron: "0 0 * ? * * *" checkUserQuoteScheduler: - enabled: true + enabled: false cron: "0 0 * ? * * *" + checkProjectQuoteScheduler: + enabled: true + cron: "0 * * ? * * *" + guacamole: connectionProtocol: ssh diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/auth/SelfServiceSecurityAuthorizer.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/auth/SelfServiceSecurityAuthorizer.java index 9b348e977c..2d93b74271 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/auth/SelfServiceSecurityAuthorizer.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/auth/SelfServiceSecurityAuthorizer.java @@ -29,6 +29,6 @@ public class SelfServiceSecurityAuthorizer implements Authorizer { @Override public boolean authorize(UserInfo principal, String role) { - return UserRoles.checkAccess(principal, RoleType.PAGE, role); + return UserRoles.checkAccess(principal, RoleType.PAGE, role, principal.getRoles()); } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java index 43f4a9ceaf..c5e0c922b6 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java @@ -84,7 +84,7 @@ private void addCondition(List conditions, String fieldName, List public Document getReport(UserInfo userInfo, AwsBillingFilter filter) { // Create filter List conditions = new ArrayList<>(); - boolean isFullReport = UserRoles.checkAccess(userInfo, RoleType.PAGE, "/api/infrastructure_provision/billing"); + boolean isFullReport = UserRoles.checkAccess(userInfo, RoleType.PAGE, "/api/infrastructure_provision/billing", userInfo.getRoles()); setUserFilter(userInfo, filter, isFullReport); addCondition(conditions, USER, filter.getUser()); addCondition(conditions, FIELD_PRODUCT, filter.getProduct()); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/azure/AzureBillingDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/azure/AzureBillingDAO.java index 5b4db2a750..42bccbc0b4 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/azure/AzureBillingDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/azure/AzureBillingDAO.java @@ -57,7 +57,7 @@ public class AzureBillingDAO extends BaseBillingDAO { public Document getReport(UserInfo userInfo, AzureBillingFilter filter) { - boolean isFullReport = UserRoles.checkAccess(userInfo, RoleType.PAGE, "/api/infrastructure_provision/billing"); + boolean isFullReport = UserRoles.checkAccess(userInfo, RoleType.PAGE, "/api/infrastructure_provision/billing", userInfo.getRoles()); setUserFilter(userInfo, filter, isFullReport); List matchCriteria = matchCriteria(filter); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 2eb6a05b05..1b60b598fd 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -12,7 +12,7 @@ public class ProjectDTO { @NotNull private final String name; @NotNull - private final Setendpoints; + private final Set endpoints; @NotNull private final Set groups; private final Integer budget; diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java index 6e951c6918..be7ad6a92e 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java @@ -79,11 +79,11 @@ public Response create(@ApiParam(hidden = true) @Auth UserInfo userInfo, @Valid @NotNull ExploratoryCreateFormDTO formDTO) { log.debug("Creating exploratory environment {} with name {} for user {}", formDTO.getImage(), formDTO.getName(), userInfo.getName()); - if (!UserRoles.checkAccess(userInfo, RoleType.EXPLORATORY, formDTO.getImage())) { + if (!UserRoles.checkAccess(userInfo, RoleType.EXPLORATORY, formDTO.getImage(), userInfo.getRoles())) { log.warn("Unauthorized attempt to create a {} by user {}", formDTO.getImage(), userInfo.getName()); throw new DlabException("You do not have the privileges to create a " + formDTO.getTemplateName()); } - String uuid = exploratoryService.create(userInfo, getExploratory(formDTO), ""); + String uuid = exploratoryService.create(userInfo, getExploratory(formDTO), formDTO.getProject()); return Response.ok(uuid).build(); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureTemplateResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureTemplateResource.java index 5d8adfefab..14a65721bf 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureTemplateResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureTemplateResource.java @@ -32,10 +32,7 @@ import io.swagger.annotations.ApiParam; import io.swagger.annotations.Authorization; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; /** @@ -61,11 +58,12 @@ public InfrastructureTemplateResource(InfrastructureTemplateService infrastructu * @param userInfo user info. */ @GET - @Path("/computational_templates") + @Path("/{project}/computational_templates") @ApiOperation("Returns list of cluster's templates") public Iterable getComputationalTemplates(@ApiParam(hidden = true) - @Auth UserInfo userInfo) { - return infrastructureTemplateService.getComputationalTemplates(userInfo); + @Auth UserInfo userInfo, + @PathParam("project") String project) { + return infrastructureTemplateService.getComputationalTemplates(userInfo, project); } /** @@ -74,10 +72,11 @@ public Iterable getComputationalTemplates(@ApiParam(h * @param userInfo user info. */ @GET - @Path("/exploratory_templates") + @Path("/{project}/exploratory_templates") @ApiOperation("Returns list of notebook's templates") - public Iterable getExploratoryTemplates(@ApiParam(hidden = true) @Auth UserInfo userInfo) { - return infrastructureTemplateService.getExploratoryTemplates(userInfo); + public Iterable getExploratoryTemplates(@ApiParam(hidden = true) @Auth UserInfo userInfo, + @PathParam("project") String project) { + return infrastructureTemplateService.getExploratoryTemplates(userInfo, project); } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java index 6346082c19..68771ad131 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java @@ -105,7 +105,7 @@ public Response createDataEngineService(@ApiParam(hidden = true) @Auth UserInfo .version(form.getVersion()) .build(); boolean resourceAdded = computationalService.createDataEngineService(userInfo, form, - awsComputationalResource); + awsComputationalResource, form.getProject()); return resourceAdded ? Response.ok().build() : Response.status(Response.Status.FOUND).build(); } @@ -133,7 +133,7 @@ public Response createDataEngine(@ApiParam(hidden = true) @Auth UserInfo userInf log.debug("Create computational resources for {} | form is {}", userInfo.getName(), form); validate(form); - return computationalService.createSparkCluster(userInfo, form) + return computationalService.createSparkCluster(userInfo, form, form.getProject()) ? Response.ok().build() : Response.status(Response.Status.FOUND).build(); } @@ -195,17 +195,19 @@ public Response stop(@ApiParam(hidden = true) @Auth UserInfo userInfo, * @return 200 OK if operation is successfully triggered */ @PUT - @Path("/{exploratoryName}/{computationalName}/start") + @Path("/{project}/{exploratoryName}/{computationalName}/start") @ApiOperation("Starts Spark cluster on AWS") @ApiResponses(@ApiResponse(code = 200, message = "Spark cluster on AWS successfully started")) public Response start(@ApiParam(hidden = true) @Auth UserInfo userInfo, @ApiParam(value = "Notebook's name corresponding to Spark cluster", required = true) @PathParam("exploratoryName") String exploratoryName, @ApiParam(value = "Spark cluster's name for starting", required = true) - @PathParam("computationalName") String computationalName) { + @PathParam("computationalName") String computationalName, + @ApiParam(value = "Project name", required = true) + @PathParam("project") String project) { log.debug("Starting computational resource {} for user {}", computationalName, userInfo.getName()); - computationalService.startSparkCluster(userInfo, exploratoryName, computationalName); + computationalService.startSparkCluster(userInfo, exploratoryName, computationalName, project); return Response.ok().build(); } @@ -260,7 +262,7 @@ private void validate(SparkStandaloneClusterCreateForm form) { } private void validate(UserInfo userInfo, AwsComputationalCreateForm formDTO) { - if (!UserRoles.checkAccess(userInfo, RoleType.COMPUTATIONAL, formDTO.getImage())) { + if (!UserRoles.checkAccess(userInfo, RoleType.COMPUTATIONAL, formDTO.getImage(), userInfo.getRoles())) { log.warn("Unauthorized attempt to create a {} by user {}", formDTO.getImage(), userInfo.getName()); throw new DlabException("You do not have the privileges to create a " + formDTO.getTemplateName()); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java index dcac05fa38..3441adacd6 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java @@ -95,12 +95,12 @@ public Response createDataEngine(@ApiParam(hidden = true) @Auth UserInfo userInf @Valid @NotNull SparkStandaloneClusterCreateForm form) { log.debug("Create computational resources for {} | form is {}", userInfo.getName(), form); - if (!UserRoles.checkAccess(userInfo, RoleType.COMPUTATIONAL, form.getImage())) { + if (!UserRoles.checkAccess(userInfo, RoleType.COMPUTATIONAL, form.getImage(), userInfo.getRoles())) { log.warn("Unauthorized attempt to create a {} by user {}", form.getImage(), userInfo.getName()); throw new DlabException("You do not have the privileges to create a " + form.getTemplateName()); } - return computationalService.createSparkCluster(userInfo, form) + return computationalService.createSparkCluster(userInfo, form, form.getProject()) ? Response.ok().build() : Response.status(Response.Status.FOUND).build(); @@ -165,17 +165,19 @@ public Response stop(@ApiParam(hidden = true) @Auth UserInfo userInfo, * @return 200 OK if operation is successfully triggered */ @PUT - @Path("/{exploratoryName}/{computationalName}/start") + @Path("/{project}/{exploratoryName}/{computationalName}/start") @ApiOperation("Starts Spark cluster on Azure") @ApiResponses(@ApiResponse(code = 200, message = "Spark cluster on Azure successfully started")) public Response start(@ApiParam(hidden = true) @Auth UserInfo userInfo, @ApiParam(value = "Notebook's name corresponding to Spark cluster", required = true) @PathParam("exploratoryName") String exploratoryName, @ApiParam(value = "Spark cluster's name for starting", required = true) - @PathParam("computationalName") String computationalName) { + @PathParam("computationalName") String computationalName, + @ApiParam(value = "Project name", required = true) + @PathParam("project") String project) { log.debug("Starting computational resource {} for user {}", computationalName, userInfo.getName()); - computationalService.startSparkCluster(userInfo, exploratoryName, computationalName); + computationalService.startSparkCluster(userInfo, exploratoryName, computationalName, project); return Response.ok().build(); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalCreateFormDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalCreateFormDTO.java index 98d51e618f..baf9bc70d3 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalCreateFormDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalCreateFormDTO.java @@ -45,6 +45,10 @@ public class ComputationalCreateFormDTO { @JsonProperty private String name; + @NotBlank + @JsonProperty + private String project; + @NotBlank @JsonProperty("notebook_name") private String notebookName; diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java index c1dee78ea6..53357d5498 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java @@ -42,6 +42,10 @@ public class ExploratoryCreateFormDTO { @JsonProperty private String name; + @NotBlank + @JsonProperty + private String project; + @NotBlank @JsonProperty private String shape; @@ -144,6 +148,14 @@ public List getClusterConfig() { return clusterConfig; } + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + @Override public String toString() { return MoreObjects.toStringHelper(this) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java index 87b7b02a6e..f213e28825 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java @@ -100,7 +100,7 @@ public Response createDataEngineService(@ApiParam(hidden = true) @Auth UserInfo .version(formDTO.getVersion()) .build(); boolean resourceAdded = computationalService.createDataEngineService(userInfo, formDTO, - gcpComputationalResource); + gcpComputationalResource, formDTO.getProject()); return resourceAdded ? Response.ok().build() : Response.status(Response.Status.FOUND).build(); } @@ -127,12 +127,12 @@ public Response createDataEngine(@ApiParam(hidden = true) @Auth UserInfo userInf @Valid @NotNull SparkStandaloneClusterCreateForm form) { log.debug("Create computational resources for {} | form is {}", userInfo.getName(), form); - if (!UserRoles.checkAccess(userInfo, RoleType.COMPUTATIONAL, form.getImage())) { + if (!UserRoles.checkAccess(userInfo, RoleType.COMPUTATIONAL, form.getImage(), userInfo.getRoles())) { log.warn("Unauthorized attempt to create a {} by user {}", form.getImage(), userInfo.getName()); throw new DlabException("You do not have the privileges to create a " + form.getTemplateName()); } - return computationalService.createSparkCluster(userInfo, form) + return computationalService.createSparkCluster(userInfo, form, form.getProject()) ? Response.ok().build() : Response.status(Response.Status.FOUND).build(); } @@ -196,17 +196,19 @@ public Response stop(@ApiParam(hidden = true) @Auth UserInfo userInfo, * @return 200 OK if operation is successfully triggered */ @PUT - @Path("/{exploratoryName}/{computationalName}/start") + @Path("/{project}/{exploratoryName}/{computationalName}/start") @ApiOperation("Starts Spark cluster on GCP") @ApiResponses(@ApiResponse(code = 200, message = "Spark cluster on GCP successfully started")) public Response start(@ApiParam(hidden = true) @Auth UserInfo userInfo, @ApiParam(value = "Notebook's name corresponding to Spark cluster", required = true) @PathParam("exploratoryName") String exploratoryName, @ApiParam(value = "Spark cluster's name for starting", required = true) - @PathParam("computationalName") String computationalName) { + @PathParam("computationalName") String computationalName, + @ApiParam(value = "Project name", required = true) + @PathParam("project") String project) { log.debug("Starting computational resource {} for user {}", computationalName, userInfo.getName()); - computationalService.startSparkCluster(userInfo, exploratoryName, computationalName); + computationalService.startSparkCluster(userInfo, exploratoryName, computationalName, project); return Response.ok().build(); } @@ -246,7 +248,7 @@ public Response getClusterConfig(@ApiParam(hidden = true) @Auth UserInfo userInf } private void validate(@Auth UserInfo userInfo, GcpComputationalCreateForm formDTO) { - if (!UserRoles.checkAccess(userInfo, RoleType.COMPUTATIONAL, formDTO.getImage())) { + if (!UserRoles.checkAccess(userInfo, RoleType.COMPUTATIONAL, formDTO.getImage(), userInfo.getRoles())) { log.warn("Unauthorized attempt to create a {} by user {}", formDTO.getImage(), userInfo.getName()); throw new DlabException("You do not have the privileges to create a " + formDTO.getTemplateName()); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java index 032d232c1d..a1fabd1ccc 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java @@ -88,28 +88,31 @@ public static List getRoles() { * @param userInfo user info. * @param type the type of role. * @param name the name of role. + * @param roles * @return boolean value */ - public static boolean checkAccess(UserInfo userInfo, RoleType type, String name) { - return checkAccess(userInfo, type, name, true); + public static boolean checkAccess(UserInfo userInfo, RoleType type, String name, Collection roles) { + return checkAccess(userInfo, type, name, true, roles); } public static boolean isAdmin(UserInfo userInfo) { final List roles = UserRoles.getRoles(); return roles == null || roles.stream().anyMatch(r -> ADMIN_ROLE_NAME.equals(r.getId()) && - (userRoles.hasAccessByGroup(userInfo, r) || userRoles.hasAccessByUserName(userInfo, r))); + (userRoles.hasAccessByGroup(userInfo, r, userInfo.getRoles()) || userRoles.hasAccessByUserName(userInfo, r))); } /** * Check access for user to the role. * + * @param roles * @param userInfo user info. * @param type the type of role. * @param name the name of role. * @return boolean value */ - public static boolean checkAccess(UserInfo userInfo, RoleType type, String name, boolean useDefault) { - return (userRoles == null || userRoles.hasAccess(userInfo, type, name, useDefault)); + public static boolean checkAccess(UserInfo userInfo, RoleType type, String name, boolean useDefault, + Collection roles) { + return (userRoles == null || userRoles.hasAccess(userInfo, type, name, useDefault, roles)); } /** @@ -216,9 +219,11 @@ private Set getAndRemoveSet(Document document, String key) { * @param type the type of role. * @param name the name of role. * @param useDefault true/false + * @param roles * @return boolean value */ - private boolean hasAccess(UserInfo userInfo, RoleType type, String name, boolean useDefault) { + private boolean hasAccess(UserInfo userInfo, RoleType type, String name, boolean useDefault, + Collection roles) { if (userRoles == null) { return true; } @@ -228,18 +233,18 @@ private boolean hasAccess(UserInfo userInfo, RoleType type, String name, boolean if (role == null) { return checkDefault(useDefault); } - if (hasAccessByGroup(userInfo, role)) return true; + if (hasAccessByGroup(userInfo, role, roles)) return true; LOGGER.trace("Access denied for user {} to {}/{}", userInfo.getName(), type, name); return false; } - private boolean hasAccessByGroup(UserInfo userInfo, UserRole role) { + private boolean hasAccessByGroup(UserInfo userInfo, UserRole role, Collection userRoles) { Set groups = role.getGroups(); if (groups != null) { if (groups.contains(ANY_USER)) { return true; } - for (String group : userInfo.getRoles()) { + for (String group : userRoles) { if (group != null && groups.contains(group.toLowerCase())) { LOGGER.trace("Got access by group {}", group); return true; @@ -248,7 +253,7 @@ private boolean hasAccessByGroup(UserInfo userInfo, UserRole role) { final Optional group = role.getGroups() .stream() - .filter(g -> userGroups.getOrDefault(g, Collections.emptySet()).contains(userInfo.getName())) + .filter(g -> userRoles.contains(g) && userGroups.getOrDefault(g, Collections.emptySet()).contains(userInfo.getName())) .findAny(); if (group.isPresent()) { LOGGER.trace("Got access by local group {}", group.get()); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureTemplateService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureTemplateService.java index 75d2b2bf65..4d6eba593f 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureTemplateService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureTemplateService.java @@ -26,7 +26,7 @@ import java.util.List; public interface InfrastructureTemplateService { - List getExploratoryTemplates(UserInfo user); + List getExploratoryTemplates(UserInfo user, String project); - List getComputationalTemplates(UserInfo user); + List getComputationalTemplates(UserInfo user, String project); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java index bdfa15509f..a03f9c9138 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java @@ -95,7 +95,7 @@ public String terminate(UserInfo userInfo, String exploratoryName) { public String create(UserInfo userInfo, Exploratory exploratory, @Project String project) { boolean isAdded = false; try { - exploratoryDAO.insertExploratory(getUserInstanceDTO(userInfo, exploratory)); + exploratoryDAO.insertExploratory(getUserInstanceDTO(userInfo, exploratory, project)); isAdded = true; final ExploratoryGitCredsDTO gitCreds = gitCredsDAO.findGitCreds(userInfo.getName()); log.debug("Created exploratory environment {} for user {}", exploratory.getName(), userInfo.getName()); @@ -310,7 +310,7 @@ private StatusEnvBaseDTO createStatusDTO(String user, String exploratoryName, .withStatus(status); } - private UserInstanceDTO getUserInstanceDTO(UserInfo userInfo, Exploratory exploratory) { + private UserInstanceDTO getUserInstanceDTO(UserInfo userInfo, Exploratory exploratory, String project) { final UserInstanceDTO userInstance = new UserInstanceDTO() .withUser(userInfo.getName()) .withExploratoryName(exploratory.getName()) @@ -319,7 +319,8 @@ private UserInstanceDTO getUserInstanceDTO(UserInfo userInfo, Exploratory explor .withImageVersion(exploratory.getVersion()) .withTemplateName(exploratory.getTemplateName()) .withClusterConfig(exploratory.getClusterConfig()) - .withShape(exploratory.getShape()); + .withShape(exploratory.getShape()) + .withProject(project); if (StringUtils.isNotBlank(exploratory.getImageName())) { final List libInstallDtoList = getImageRelatedLibraries(userInfo, exploratory .getImageName()); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBase.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBase.java index 4193fc62ed..e597d94d5c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBase.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBase.java @@ -21,7 +21,9 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.SelfServiceApplicationConfiguration; +import com.epam.dlab.backendapi.dao.ProjectDAO; import com.epam.dlab.backendapi.dao.SettingsDAO; +import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.resources.dto.SparkStandaloneConfiguration; import com.epam.dlab.backendapi.roles.RoleType; import com.epam.dlab.backendapi.roles.UserRoles; @@ -43,6 +45,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import static com.epam.dlab.rest.contracts.DockerAPI.DOCKER_COMPUTATIONAL; @@ -56,6 +59,8 @@ public abstract class InfrastructureTemplateServiceBase implements Infrastructur @Inject private SettingsDAO settingsDAO; + @Inject + private ProjectDAO projectDAO; @Inject @@ -63,18 +68,20 @@ public abstract class InfrastructureTemplateServiceBase implements Infrastructur private RESTService provisioningService; @Override - public List getExploratoryTemplates(UserInfo user) { + public List getExploratoryTemplates(UserInfo user, String project) { - log.debug("Loading list of exploratory templates for user {}", user.getName()); + log.debug("Loading list of exploratory templates for user {} for project {}", user.getName(), project); try { ExploratoryMetadataDTO[] array = provisioningService.get(DOCKER_EXPLORATORY, user.getAccessToken(), ExploratoryMetadataDTO[].class); + final Set roles = getRoles(user, project); return Arrays.stream(array) .peek(e -> e.setImage(getSimpleImageName(e.getImage()))) .filter(e -> exploratoryGpuIssuesAzureFilter(e) && - UserRoles.checkAccess(user, RoleType.EXPLORATORY, e.getImage())) - .peek(e -> filterShapes(user, e.getExploratoryEnvironmentShapes(), RoleType.EXPLORATORY_SHAPES)) + UserRoles.checkAccess(user, RoleType.EXPLORATORY, e.getImage(), roles)) + .peek(e -> filterShapes(user, e.getExploratoryEnvironmentShapes(), RoleType.EXPLORATORY_SHAPES, + roles)) .collect(Collectors.toList()); } catch (DlabException e) { @@ -89,15 +96,16 @@ public List getExploratoryTemplates(UserInfo user) { * @param user user * @param environmentShapes shape types * @param roleType + * @param roles */ private void filterShapes(UserInfo user, Map> environmentShapes, - RoleType roleType) { + RoleType roleType, Set roles) { environmentShapes.forEach((k, v) -> v.removeIf(compResShapeDto -> - !UserRoles.checkAccess(user, roleType, compResShapeDto.getType()))); + !UserRoles.checkAccess(user, roleType, compResShapeDto.getType(), roles))); } @Override - public List getComputationalTemplates(UserInfo user) { + public List getComputationalTemplates(UserInfo user, String project) { log.debug("Loading list of computational templates for user {}", user.getName()); try { @@ -105,10 +113,13 @@ public List getComputationalTemplates(UserInfo user) provisioningService.get(DOCKER_COMPUTATIONAL, user.getAccessToken(), ComputationalMetadataDTO[] .class); + final Set roles = getRoles(user, project); + return Arrays.stream(array) .peek(e -> e.setImage(getSimpleImageName(e.getImage()))) - .peek(e -> filterShapes(user, e.getComputationResourceShapes(), RoleType.COMPUTATIONAL_SHAPES)) - .filter(e -> UserRoles.checkAccess(user, RoleType.COMPUTATIONAL, e.getImage())) + .peek(e -> filterShapes(user, e.getComputationResourceShapes(), RoleType.COMPUTATIONAL_SHAPES, + user.getRoles())) + .filter(e -> UserRoles.checkAccess(user, RoleType.COMPUTATIONAL, e.getImage(), roles)) .map(this::fullComputationalTemplate) .collect(Collectors.toList()); @@ -118,6 +129,12 @@ public List getComputationalTemplates(UserInfo user) } } + private Set getRoles(UserInfo user, String project) { + return projectDAO.get(project) + .map(ProjectDTO::getGroups) + .orElse(user.getRoles()); + } + protected abstract FullComputationalTemplate getCloudFullComputationalTemplate(ComputationalMetadataDTO metadataDTO); diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java index 0266a8bac0..0462732230 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java @@ -74,7 +74,7 @@ public void create() { assertEquals("someUuid", response.readEntity(String.class)); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO()), ""); + verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO()), "project"); verifyNoMoreInteractions(exploratoryService); } @@ -111,7 +111,7 @@ public void createWithException() { assertTrue(actualJson.contains(expectedJson)); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO()), anyString()); + verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO()), "project"); verifyNoMoreInteractions(exploratoryService); } @@ -303,6 +303,7 @@ private ExploratoryCreateFormDTO getExploratoryCreateFormDTO() { ecfDto.setShape("someShape"); ecfDto.setVersion("someVersion"); ecfDto.setImageName("someImageName"); + ecfDto.setProject("project"); return ecfDto; } diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureTemplateResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureTemplateResourceTest.java index a054ff7816..f4f57db468 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureTemplateResourceTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureTemplateResourceTest.java @@ -60,10 +60,10 @@ public void setup() throws AuthenticationException { public void getComputationalTemplates() { FullComputationalTemplate fullComputationalTemplate = new FullComputationalTemplate(new ComputationalMetadataDTO()); - when(infrastructureTemplateService.getComputationalTemplates(any(UserInfo.class))) + when(infrastructureTemplateService.getComputationalTemplates(any(UserInfo.class), anyString())) .thenReturn(Collections.singletonList(fullComputationalTemplate)); final Response response = resources.getJerseyTest() - .target("/infrastructure_templates/computational_templates") + .target("/infrastructure_templates/test/computational_templates") .request() .header("Authorization", "Bearer " + TOKEN) .get(); @@ -71,7 +71,7 @@ public void getComputationalTemplates() { assertEquals(HttpStatus.SC_OK, response.getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureTemplateService).getComputationalTemplates(getUserInfo()); + verify(infrastructureTemplateService).getComputationalTemplates(getUserInfo(), "test"); verifyNoMoreInteractions(infrastructureTemplateService); } @@ -80,10 +80,10 @@ public void getComputationalTemplatesWithFailedAuth() throws AuthenticationExcep authFailSetup(); FullComputationalTemplate fullComputationalTemplate = new FullComputationalTemplate(new ComputationalMetadataDTO()); - when(infrastructureTemplateService.getComputationalTemplates(any(UserInfo.class))) + when(infrastructureTemplateService.getComputationalTemplates(any(UserInfo.class), anyString())) .thenReturn(Collections.singletonList(fullComputationalTemplate)); final Response response = resources.getJerseyTest() - .target("/infrastructure_templates/computational_templates") + .target("/infrastructure_templates/test/computational_templates") .request() .header("Authorization", "Bearer " + TOKEN) .get(); @@ -91,16 +91,16 @@ public void getComputationalTemplatesWithFailedAuth() throws AuthenticationExcep assertEquals(HttpStatus.SC_OK, response.getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureTemplateService).getComputationalTemplates(getUserInfo()); + verify(infrastructureTemplateService).getComputationalTemplates(getUserInfo(), "test"); verifyNoMoreInteractions(infrastructureTemplateService); } @Test public void getComputationalTemplatesWithException() { doThrow(new DlabException("Could not load list of computational templates for user")) - .when(infrastructureTemplateService).getComputationalTemplates(any(UserInfo.class)); + .when(infrastructureTemplateService).getComputationalTemplates(any(UserInfo.class), anyString()); final Response response = resources.getJerseyTest() - .target("/infrastructure_templates/computational_templates") + .target("/infrastructure_templates/test/computational_templates") .request() .header("Authorization", "Bearer " + TOKEN) .get(); @@ -108,7 +108,7 @@ public void getComputationalTemplatesWithException() { assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureTemplateService).getComputationalTemplates(getUserInfo()); + verify(infrastructureTemplateService).getComputationalTemplates(getUserInfo(), "test"); verifyNoMoreInteractions(infrastructureTemplateService); } @@ -116,10 +116,10 @@ public void getComputationalTemplatesWithException() { public void getExploratoryTemplates() { ExploratoryMetadataDTO exploratoryMetadataDTO = new ExploratoryMetadataDTO("someImageName"); - when(infrastructureTemplateService.getExploratoryTemplates(any(UserInfo.class))) + when(infrastructureTemplateService.getExploratoryTemplates(any(UserInfo.class), anyString())) .thenReturn(Collections.singletonList(exploratoryMetadataDTO)); final Response response = resources.getJerseyTest() - .target("/infrastructure_templates/exploratory_templates") + .target("/infrastructure_templates/test/exploratory_templates") .request() .header("Authorization", "Bearer " + TOKEN) .get(); @@ -130,7 +130,7 @@ public void getExploratoryTemplates() { })); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureTemplateService).getExploratoryTemplates(getUserInfo()); + verify(infrastructureTemplateService).getExploratoryTemplates(getUserInfo(), "test"); verifyNoMoreInteractions(infrastructureTemplateService); } @@ -139,10 +139,10 @@ public void getExploratoryTemplatesWithFailedAuth() throws AuthenticationExcepti authFailSetup(); ExploratoryMetadataDTO exploratoryMetadataDTO = new ExploratoryMetadataDTO("someImageName"); - when(infrastructureTemplateService.getExploratoryTemplates(any(UserInfo.class))) + when(infrastructureTemplateService.getExploratoryTemplates(any(UserInfo.class), anyString())) .thenReturn(Collections.singletonList(exploratoryMetadataDTO)); final Response response = resources.getJerseyTest() - .target("/infrastructure_templates/exploratory_templates") + .target("/infrastructure_templates/test/exploratory_templates") .request() .header("Authorization", "Bearer " + TOKEN) .get(); @@ -153,7 +153,7 @@ public void getExploratoryTemplatesWithFailedAuth() throws AuthenticationExcepti })); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureTemplateService).getExploratoryTemplates(getUserInfo()); + verify(infrastructureTemplateService).getExploratoryTemplates(getUserInfo(), "test"); verifyNoMoreInteractions(infrastructureTemplateService); } @@ -161,9 +161,9 @@ public void getExploratoryTemplatesWithFailedAuth() throws AuthenticationExcepti @Test public void getExploratoryTemplatesWithException() { doThrow(new DlabException("Could not load list of exploratory templates for user")) - .when(infrastructureTemplateService).getExploratoryTemplates(any(UserInfo.class)); + .when(infrastructureTemplateService).getExploratoryTemplates(any(UserInfo.class), anyString()); final Response response = resources.getJerseyTest() - .target("/infrastructure_templates/exploratory_templates") + .target("/infrastructure_templates/test/exploratory_templates") .request() .header("Authorization", "Bearer " + TOKEN) .get(); @@ -171,7 +171,7 @@ public void getExploratoryTemplatesWithException() { assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureTemplateService).getExploratoryTemplates(getUserInfo()); + verify(infrastructureTemplateService).getExploratoryTemplates(getUserInfo(), "test"); verifyNoMoreInteractions(infrastructureTemplateService); } } diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/roles/UserRolesTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/roles/UserRolesTest.java index d974c81555..0fa4c9426c 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/roles/UserRolesTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/roles/UserRolesTest.java @@ -75,14 +75,14 @@ public void checkAccess() { when(cursor.next()).thenReturn(doc1).thenReturn(doc2); UserRoles.initialize(dao, true); - assertTrue(UserRoles.checkAccess(userInfoDev, RoleType.EXPLORATORY_SHAPES, "shape_1")); - assertTrue(UserRoles.checkAccess(userInfoDev, RoleType.EXPLORATORY_SHAPES, "shape_2")); - assertTrue(UserRoles.checkAccess(userInfoDev, RoleType.EXPLORATORY_SHAPES, "shape_3")); - assertTrue(UserRoles.checkAccess(userInfoDev, RoleType.EXPLORATORY_SHAPES, "someShape")); + assertTrue(UserRoles.checkAccess(userInfoDev, RoleType.EXPLORATORY_SHAPES, "shape_1", userInfoDev.getRoles())); + assertTrue(UserRoles.checkAccess(userInfoDev, RoleType.EXPLORATORY_SHAPES, "shape_2", userInfoDev.getRoles())); + assertTrue(UserRoles.checkAccess(userInfoDev, RoleType.EXPLORATORY_SHAPES, "shape_3", userInfoDev.getRoles())); + assertTrue(UserRoles.checkAccess(userInfoDev, RoleType.EXPLORATORY_SHAPES, "someShape", userInfoDev.getRoles())); - assertFalse(UserRoles.checkAccess(userInfoTest, RoleType.EXPLORATORY_SHAPES, "shape_1")); - assertFalse(UserRoles.checkAccess(userInfoTest, RoleType.EXPLORATORY_SHAPES, "shape_2")); - assertFalse(UserRoles.checkAccess(userInfoTest, RoleType.EXPLORATORY_SHAPES, "shape_3")); - assertTrue(UserRoles.checkAccess(userInfoTest, RoleType.EXPLORATORY_SHAPES, "someShape")); + assertFalse(UserRoles.checkAccess(userInfoTest, RoleType.EXPLORATORY_SHAPES, "shape_1", userInfoTest.getRoles())); + assertFalse(UserRoles.checkAccess(userInfoTest, RoleType.EXPLORATORY_SHAPES, "shape_2", userInfoTest.getRoles())); + assertFalse(UserRoles.checkAccess(userInfoTest, RoleType.EXPLORATORY_SHAPES, "shape_3", userInfoTest.getRoles())); + assertTrue(UserRoles.checkAccess(userInfoTest, RoleType.EXPLORATORY_SHAPES, "someShape", userInfoTest.getRoles())); } } diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java index 225a5c8ccc..770274e47e 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java @@ -20,7 +20,9 @@ package com.epam.dlab.backendapi.service.impl; import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.dao.ProjectDAO; import com.epam.dlab.backendapi.dao.SettingsDAO; +import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.dto.base.computational.FullComputationalTemplate; import com.epam.dlab.dto.imagemetadata.ComputationalMetadataDTO; import com.epam.dlab.dto.imagemetadata.ComputationalResourceShapeDto; @@ -34,10 +36,7 @@ import org.mockito.runners.MockitoJUnitRunner; import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; import static org.junit.Assert.*; @@ -50,6 +49,8 @@ public class InfrastructureTemplateServiceBaseTest { private SettingsDAO settingsDAO; @Mock private RESTService provisioningService; + @Mock + private ProjectDAO projectDAO; @InjectMocks private InfrastructureTemplateServiceBaseChild infrastructureTemplateServiceBaseChild = @@ -75,12 +76,14 @@ public void getExploratoryTemplates() { "someRam2", 6))); emDto2.setExploratoryEnvironmentShapes(shapes2); List expectedEmdDtoList = Arrays.asList(emDto1, emDto2); + when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), + Collections.singleton("project"), null))); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedEmdDtoList.toArray()); when(settingsDAO.getConfOsFamily()).thenReturn("someConfOsFamily"); UserInfo userInfo = new UserInfo("test", "token"); List actualEmdDtoList = - infrastructureTemplateServiceBaseChild.getExploratoryTemplates(userInfo); + infrastructureTemplateServiceBaseChild.getExploratoryTemplates(userInfo, "project"); assertNotNull(actualEmdDtoList); assertEquals(expectedEmdDtoList, actualEmdDtoList); @@ -96,7 +99,7 @@ public void getExploratoryTemplatesWithException() { UserInfo userInfo = new UserInfo("test", "token"); try { - infrastructureTemplateServiceBaseChild.getExploratoryTemplates(userInfo); + infrastructureTemplateServiceBaseChild.getExploratoryTemplates(userInfo, "project"); } catch (DlabException e) { assertEquals("Could not load list of exploratory templates for user", e.getMessage()); } @@ -106,11 +109,14 @@ public void getExploratoryTemplatesWithException() { @Test public void getComputationalTemplates() throws NoSuchFieldException, IllegalAccessException { + final ComputationalMetadataDTO computationalMetadataDTO = new ComputationalMetadataDTO("dataengine-service"); computationalMetadataDTO.setComputationResourceShapes(Collections.emptyMap()); List expectedCmdDtoList = Collections.singletonList( computationalMetadataDTO ); + when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), + Collections.singleton("project"), null))); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedCmdDtoList.toArray(new ComputationalMetadataDTO[]{})); List expectedFullCmdDtoList = expectedCmdDtoList.stream() @@ -119,7 +125,7 @@ public void getComputationalTemplates() throws NoSuchFieldException, IllegalAcce UserInfo userInfo = new UserInfo("test", "token"); List actualFullCmdDtoList = - infrastructureTemplateServiceBaseChild.getComputationalTemplates(userInfo); + infrastructureTemplateServiceBaseChild.getComputationalTemplates(userInfo, "project"); assertNotNull(actualFullCmdDtoList); assertEquals(expectedFullCmdDtoList.size(), actualFullCmdDtoList.size()); for (int i = 0; i < expectedFullCmdDtoList.size(); i++) { @@ -137,7 +143,7 @@ public void getComputationalTemplatesWhenMethodThrowsException() { UserInfo userInfo = new UserInfo("test", "token"); try { - infrastructureTemplateServiceBaseChild.getComputationalTemplates(userInfo); + infrastructureTemplateServiceBaseChild.getComputationalTemplates(userInfo, "project"); } catch (DlabException e) { assertEquals("Could not load list of computational templates for user", e.getMessage()); } @@ -151,10 +157,12 @@ public void getComputationalTemplatesWithInapproprietaryImageName() { computationalMetadataDTO.setComputationResourceShapes(Collections.emptyMap()); List expectedCmdDtoList = Collections.singletonList(computationalMetadataDTO); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedCmdDtoList.toArray(new ComputationalMetadataDTO[]{})); + when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), + Collections.singleton("project"), null))); UserInfo userInfo = new UserInfo("test", "token"); try { - infrastructureTemplateServiceBaseChild.getComputationalTemplates(userInfo); + infrastructureTemplateServiceBaseChild.getComputationalTemplates(userInfo, "project"); } catch (IllegalArgumentException e) { assertEquals("Unknown data engine null", e.getMessage()); } @@ -165,6 +173,7 @@ public void getComputationalTemplatesWithInapproprietaryImageName() { private boolean areFullComputationalTemplatesEqual(FullComputationalTemplate object1, FullComputationalTemplate object2) throws NoSuchFieldException, IllegalAccessException { + String project = "";//TODO CHANGEIT Field computationalMetadataDTO1 = object1.getClass().getDeclaredField("computationalMetadataDTO"); computationalMetadataDTO1.setAccessible(true); Field computationalMetadataDTO2 = object2.getClass().getDeclaredField("computationalMetadataDTO"); From b94583ec797215406d1c672c6d12326ff544b454 Mon Sep 17 00:00:00 2001 From: bhliva Date: Fri, 31 May 2019 11:55:07 +0300 Subject: [PATCH 111/357] DLAB-000 added configuration for prod module --- .../com/epam/dlab/backendapi/modules/ProductionModule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java index 7db5b26926..2ed65c40ae 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java @@ -87,5 +87,9 @@ protected void configure() { bind(ApplicationSettingService.class).to(ApplicationSettingServiceImpl.class); bind(UserSettingService.class).to(UserSettingServiceImpl.class); bind(GuacamoleService.class).to(GuacamoleServiceImpl.class); + bind(EndpointService.class).to(EndpointServiceImpl.class); + bind(EndpointDAO.class).to(EndpointDAOImpl.class); + bind(ProjectService.class).to(ProjectServiceImpl.class); + bind(ProjectDAO.class).to(ProjectDAOImpl.class); } } From b8dc603d77524e3ae682189616aac59efc376cef Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 31 May 2019 13:53:34 +0300 Subject: [PATCH 112/357] [DLAB-631]: added detailed dialogs formatting --- .../webapp/src/assets/styles/_dialogs.scss | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index 6ed2eb02ac..b09140561c 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -178,3 +178,65 @@ mat-dialog-container { .content-box { padding: 25px 30px 35px; } + + +.detail-header { + border-bottom: 0; + width: 100%; + border-collapse: collapse; + table-layout: fixed; + td { + border: 1px solid #edf1f5; + text-align: center; + padding: 20px; + text-align: center !important; + background: #fff; + &:first-child { + background: #f6fafe; + font-size: 16px; + font-weight: 600; + color: #455c74; + text-overflow: ellipsis; + overflow: hidden; + cursor: default; + } + &.tooltip-wrap { + .hint-title { + font-size: 16px; + font-weight: 600; + color: #455c74; + overflow: hidden; + text-overflow: ellipsis; + } + } + } +} + +.detail-info { + p { + font-weight: 400; + margin-bottom: 10px; + small { + font-size: 12px; + font-weight: 400; + } + } + span { + font-size: 14px; + overflow: hidden; + text-overflow: ellipsis; + display: block; + } + .links_block { + padding-left: 25px; + } + .time_info { + margin-top: 15px; + } +} + +.create-cluster { + .dialog-header { + padding-left: 45px !important; + } +} \ No newline at end of file From abf2d7db5c74862be0e5ba55b11f19adc3185a9c Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 31 May 2019 13:54:36 +0300 Subject: [PATCH 113/357] [DLAB-631]: desabled clear action on edit project form --- .../project/project-form/project-form.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index fea70ccd39..2057a6213a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -64,7 +64,7 @@
- +
@@ -81,10 +81,10 @@ - + playlist_add_check All - + clear None @@ -100,7 +100,7 @@
- +
-
-
-
+
+
+ +
- -
- + +
+ + Select project + + {{ project.name }} + + +
-
- - {{ model.exploratoryEnvironmentTemplates[0].description }} - - {{ templateDescription }} +
+ +
+ +
+ + Select template + + + {{ template.exploratory_environment_versions[0].template_name }} + + + +
-
+
-
- +
+ + + Select {{ DICTIONARY.image }} + + {{ image.name }} + + +
- - This name already exists. - Name + This name already exists. + Name cannot be longer than 10 characters and can only contain letters, numbers, hyphens and '_' but can not end with special characters
+
-
- +
+ + Select {{ DICTIONARY.notebook_instance_size }} + + + + {{ list_item.Size }} {{ list_item.Type }} + + + + +
@@ -75,7 +119,7 @@

Create analytical tool

- Configuration parameters is not in a valid format + Configuration parameters is not in a valid format
@@ -86,7 +130,7 @@

Create analytical tool

- +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts index c0f7e5fe8d..f59100597d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts @@ -22,8 +22,10 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; +import { Project } from '../../../administration/project/project.component'; + import { ExploratoryEnvironmentCreateModel } from './exploratory-environment-create.model'; -import { UserResourceService } from '../../../core/services'; +import { UserResourceService, ProjectService } from '../../../core/services'; import { CheckUtils, HTTP_STATUS_CODES } from '../../../core/util'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import { CLUSTER_CONFIGURATION } from '../../computational/computational-resource-create-dialog/cluster-configuration-templates'; @@ -36,50 +38,75 @@ import { CLUSTER_CONFIGURATION } from '../../computational/computational-resourc export class ExploratoryEnvironmentCreateComponent implements OnInit { readonly DICTIONARY = DICTIONARY; + projects: Project[] =[]; + templates = []; + currentTemplate: any; + shapes: Array = []; model: ExploratoryEnvironmentCreateModel; templateDescription: string; namePattern = '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+'; resourceGrid: any; - userImages: Array; + images: Array; environment_shape: string; - public createExploratoryEnvironmentForm: FormGroup; + public createExploratoryForm: FormGroup; - @ViewChild('environment_name') environment_name; - @ViewChild('templatesList') templates_list; - @ViewChild('shapesList') shapes_list; - @ViewChild('imagesList') userImagesList; + // @ViewChild('environment_name') environment_name; + // @ViewChild('templatesList') templates_list; + // @ViewChild('shapesList') shapes_list; + // @ViewChild('imagesList') userImagesList; @ViewChild('configurationNode') configuration; @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); constructor( @Inject(MAT_DIALOG_DATA) public data: any, + public toastr: ToastrService, + public dialogRef: MatDialogRef, private userResourceService: UserResourceService, private _fb: FormBuilder, private changeDetector: ChangeDetectorRef, - public toastr: ToastrService, - public dialogRef: MatDialogRef, + private projectService: ProjectService ) { this.model = ExploratoryEnvironmentCreateModel.getDefault(userResourceService); this.resourceGrid = data; } ngOnInit() { + this.getProjects(); + this.initFormModel(); - // this.bindDialog.onClosing = () => this.resetDialog(); - this.open(); + // this.open(); } initFormModel(): void { - this.createExploratoryEnvironmentForm = this._fb.group({ + this.createExploratoryForm = this._fb.group({ + project: [''], + template_name: [''], + image: [''], + shape: [''], environment_name: ['', [Validators.required, Validators.pattern(this.namePattern), this.providerMaxLength, this.checkDuplication.bind(this)]], configuration_parameters: ['', [this.validConfiguration.bind(this)]] }); } + public getProjects() { + this.projectService.getProjectsList().subscribe((projects: any) => this.projects = projects); + } + + public getTemplates($event) { + this.userResourceService.getExploratoryTemplates($event.value).subscribe(templates => this.templates = templates); + } + + public getShapes($event, template) { + this.currentTemplate = template; + this.shapes = template.exploratory_environment_shapes; + this.getImagesList(); + debugger; + } + providerMaxLength(control) { if (DICTIONARY.cloud_provider !== 'aws') return control.value.length <= 10 ? null : { valid: false }; @@ -102,32 +129,32 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { return resourceShapes[index][0][byField]; } - setDefaultParams(): void { - this.environment_shape = this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'type'); + // setDefaultParams(): void { + // this.environment_shape = this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'type'); - this.templates_list.setDefaultOptions(this.model.exploratoryEnvironmentTemplates, - this.model.selectedItem.template_name, 'template', 'template_name', 'array'); - this.shapes_list.setDefaultOptions(this.model.selectedItem.shapes.resourcesShapeTypes, - this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'description'), 'shape', 'description', 'json'); + // this.templates_list.setDefaultOptions(this.model.exploratoryEnvironmentTemplates, + // this.model.selectedItem.template_name, 'template', 'template_name', 'array'); + // this.shapes_list.setDefaultOptions(this.model.selectedItem.shapes.resourcesShapeTypes, + // this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'description'), 'shape', 'description', 'json'); - if (this.userImages && this.userImages.length > 0) { - this.userImagesList.setDefaultOptions(this.userImages, 'Select existing ' + DICTIONARY.image, 'ami', 'name', 'array', null, true); - } - } + // if (this.userImages && this.userImages.length > 0) { + // this.userImagesList.setDefaultOptions(this.userImages, 'Select existing ' + DICTIONARY.image, 'ami', 'name', 'array', null, true); + // } + // } - onUpdate($event): void { - if ($event.model.type === 'template') { - this.model.setSelectedTemplate($event.model.index); - this.shapes_list.setDefaultOptions(this.model.selectedItem.shapes.resourcesShapeTypes, - this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'description'), 'shape', 'description', 'json'); - this.environment_shape = this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'type'); + // onUpdate($event): void { + // if ($event.model.type === 'template') { + // this.model.setSelectedTemplate($event.model.index); + // this.shapes_list.setDefaultOptions(this.model.selectedItem.shapes.resourcesShapeTypes, + // this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'description'), 'shape', 'description', 'json'); + // this.environment_shape = this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'type'); - this.getImagesList(); - } + // this.getImagesList(); + // } - if ($event.model.type === 'shape') - this.environment_shape = $event.model.value.type; - } + // if ($event.model.type === 'shape') + // this.environment_shape = $event.model.value.type; + // } selectImage($event): void { this.model.notebookImage = $event.model.value ? $event.model.value.fullName : null; @@ -143,46 +170,38 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { return false; } - public open(params?): void { - this.model = new ExploratoryEnvironmentCreateModel('', '', '', '', '', - response => { - if (response.status === HTTP_STATUS_CODES.OK) this.dialogRef.close(); - }, - error => this.toastr.error(error.message || 'Exploratory creation failed!', 'Oops!'), - () => this.templateDescription = this.model.selectedItem.description, - () => { - this.initFormModel(); - this.setDefaultParams(); - this.getImagesList(); - }, - this.userResourceService); - } - - getImagesList() { - const image = this.model.selectedItem.image; - this.userResourceService.getUserImages(image) - .subscribe((res: any) => { - this.userImages = res.filter(el => el.status === 'CREATED'); - - this.changeDetector.detectChanges(); - this.setDefaultParams(); - }, - error => this.toastr.error(error.message || 'Images list loading failed!', 'Oops!')); - } + // public open(params?): void { + // this.model = new ExploratoryEnvironmentCreateModel('', '', '', '', '', + // response => { + // if (response.status === HTTP_STATUS_CODES.OK) this.dialogRef.close(); + // }, + // error => this.toastr.error(error.message || 'Exploratory creation failed!', 'Oops!'), + // () => this.templateDescription = this.model.selectedItem.description, + // () => { + // this.initFormModel(); + // // this.setDefaultParams(); + // this.getImagesList(); + // }, + // this.userResourceService); + // } public selectConfiguration() { - if (this.configuration.nativeElement.checked && this.createExploratoryEnvironmentForm) { - this.createExploratoryEnvironmentForm.controls['configuration_parameters'] + if (this.configuration.nativeElement.checked && this.createExploratoryForm) { + this.createExploratoryForm.controls['configuration_parameters'] .setValue(JSON.stringify(CLUSTER_CONFIGURATION.SPARK, undefined, 2)); } else { - this.createExploratoryEnvironmentForm.controls['configuration_parameters'].setValue(''); + this.createExploratoryForm.controls['configuration_parameters'].setValue(''); } } - private resetDialog(): void { - this.initFormModel(); - this.model.resetModel(); + private getImagesList() { + this.userResourceService.getUserImages(this.currentTemplate.image) + .subscribe((res: any) => { + this.images = res.filter(el => el.status === 'CREATED'); - if (this.configuration) this.configuration.nativeElement['checked'] = false; + // this.changeDetector.detectChanges(); + // this.setDefaultParams(); + }, + error => this.toastr.error(error.message || 'Images list loading failed!', 'Oops!')); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts index 39430b517e..a22262c5fe 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts @@ -70,7 +70,6 @@ export class ExploratoryEnvironmentCreateModel { environment_shape, fnProcessResults, fnProcessErrors); - this.loadTemplates(); } public setSelectedItem(item: ExploratoryEnvironmentVersionModel): void { @@ -94,32 +93,32 @@ export class ExploratoryEnvironmentCreateModel { this.config = config; } - public loadTemplates(): void { - if (this.exploratoryEnvironmentTemplates.length === 0) - this.userResourceService.getExploratoryEnvironmentTemplates() - .subscribe( - data => { - for (let parentIndex = 0; parentIndex < data.length; parentIndex++) { - - const shapeJson = data[parentIndex].exploratory_environment_shapes; - const exploratoryJson = data[parentIndex].exploratory_environment_versions; - const shapeObj: ResourceShapeTypesModel = new ResourceShapeTypesModel(SortUtil.shapesSort(shapeJson)); - - for (let index = 0; index < exploratoryJson.length; index++) - this.exploratoryEnvironmentTemplates.push( - new ExploratoryEnvironmentVersionModel(data[parentIndex].image, exploratoryJson[index], shapeObj)); - } - if (this.exploratoryEnvironmentTemplates.length > 0) { - this.exploratoryEnvironmentTemplates.sort(function(t1, t2) { - return ((t1.template_name < t2.template_name) ? -1 : ((t1.template_name > t2.template_name) ? 1 : 0)); - }); - this.setSelectedTemplate(0); - } - - if (this.continueWith) - this.continueWith(); - }); - } + // public loadTemplates(): void { + // if (this.exploratoryEnvironmentTemplates.length === 0) + // this.userResourceService.getExploratoryEnvironmentTemplates() + // .subscribe( + // data => { + // for (let parentIndex = 0; parentIndex < data.length; parentIndex++) { + + // const shapeJson = data[parentIndex].exploratory_environment_shapes; + // const exploratoryJson = data[parentIndex].exploratory_environment_versions; + // const shapeObj: ResourceShapeTypesModel = new ResourceShapeTypesModel(SortUtil.shapesSort(shapeJson)); + + // for (let index = 0; index < exploratoryJson.length; index++) + // this.exploratoryEnvironmentTemplates.push( + // new ExploratoryEnvironmentVersionModel(data[parentIndex].image, exploratoryJson[index], shapeObj)); + // } + // if (this.exploratoryEnvironmentTemplates.length > 0) { + // this.exploratoryEnvironmentTemplates.sort(function(t1, t2) { + // return ((t1.template_name < t2.template_name) ? -1 : ((t1.template_name > t2.template_name) ? 1 : 0)); + // }); + // this.setSelectedTemplate(0); + // } + + // if (this.continueWith) + // this.continueWith(); + // }); + // } public resetModel(): void { this.setSelectedTemplate(0); diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts index 073b5e92f2..d4a70ad5fc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts @@ -61,7 +61,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
`, styles: [` - .content { color: #718ba6; padding: 20px 50px; font-size: 14px; font-weight: 400 } + .content { color: #718ba6; padding: 20px 50px; font-size: 14px; font-weight: 400; margin: 0; } .info { color: #35afd5; } .info .confirm-dialog { color: #607D8B; } header { display: flex; justify-content: space-between; color: #607D8B; } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index b34ca96ffb..ab6949a7b5 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -235,7 +235,8 @@ word-break: break-all; } .manage-roles, -.project-form { +.project-form, +.selection { .mat-form-field { width: 100%; } From ad5f06b16c1140874a96b25e5414db9de5dae01b Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 31 May 2019 16:04:39 +0300 Subject: [PATCH 117/357] [DLAB-655]: added projects to exploratory creation --- .../webapp/src/app/core/util/patterns.ts | 22 +++++++++++++++++ .../create-environment.component.scss | 8 +++++++ ...y-environment-create-dialog.component.html | 20 ++++++++-------- ...ory-environment-create-dialog.component.ts | 24 +++++++------------ .../webapp/src/assets/styles/_general.scss | 9 +++++++ .../webapp/src/assets/styles/_theme.scss | 10 +++++--- .../src/main/resources/webapp/src/styles.scss | 5 ++++ 7 files changed, 69 insertions(+), 29 deletions(-) create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts new file mode 100644 index 0000000000..3cb9b12efb --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export const PATTERNS = { + +} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss index 2eb2014f9e..f5b20c8da5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss @@ -47,3 +47,11 @@ } } } + +.control-group { + .error { + position: absolute; + right: 0; + bottom: 3px; + } +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html index 4759788043..fa55bc9c4b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html @@ -45,10 +45,10 @@

Create analytical tool

-
+
Select template - + @@ -65,10 +65,10 @@

Create analytical tool

- Select {{ DICTIONARY.image }} + None {{ image.name }} - +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts index f59100597d..ea04b92a97 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts @@ -77,7 +77,6 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { this.getProjects(); this.initFormModel(); - // this.open(); } initFormModel(): void { @@ -104,7 +103,6 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { this.currentTemplate = template; this.shapes = template.exploratory_environment_shapes; this.getImagesList(); - debugger; } providerMaxLength(control) { @@ -156,8 +154,9 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { // this.environment_shape = $event.model.value.type; // } - selectImage($event): void { - this.model.notebookImage = $event.model.value ? $event.model.value.fullName : null; + public selectImage($event): void { + debugger; + // this.model.notebookImage = $event.model.value ? $event.model.value.fullName : null; } createExploratoryEnvironment_btnClick($event, data) { @@ -186,22 +185,15 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { // } public selectConfiguration() { - if (this.configuration.nativeElement.checked && this.createExploratoryForm) { - this.createExploratoryForm.controls['configuration_parameters'] - .setValue(JSON.stringify(CLUSTER_CONFIGURATION.SPARK, undefined, 2)); - } else { - this.createExploratoryForm.controls['configuration_parameters'].setValue(''); - } + const value = (this.configuration.nativeElement.checked && this.createExploratoryForm) + ? JSON.stringify(CLUSTER_CONFIGURATION.SPARK, undefined, 2) : ''; + + this.createExploratoryForm.controls['configuration_parameters'].setValue(value); } private getImagesList() { this.userResourceService.getUserImages(this.currentTemplate.image) - .subscribe((res: any) => { - this.images = res.filter(el => el.status === 'CREATED'); - - // this.changeDetector.detectChanges(); - // this.setDefaultParams(); - }, + .subscribe((res: any) => this.images = res.filter(el => el.status === 'CREATED'), error => this.toastr.error(error.message || 'Images list loading failed!', 'Oops!')); } } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss index 718da2e086..ad9a55154d 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss @@ -156,4 +156,13 @@ button { padding-right: 5px; overflow: hidden; } +} + +.icon-label { + display: inline-block; + width: 30px; + text-align: center; + vertical-align: middle; + color: #35afd5; + line-height: 26px; } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index ab6949a7b5..1c69be9528 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -88,6 +88,7 @@ } .caret { width: 40px; + height: 40px; color: #4ab8dc; border: none; border-left: 1px solid #ececec; @@ -95,7 +96,6 @@ position: absolute; right: 0; top: 0px; - height: 36px; cursor: pointer; &.not-allowed { background-color: #dcdcdc; @@ -144,6 +144,10 @@ .mat-option { font-family: 'Open Sans', sans-serif; + .mat-option-text { + color: #607D8B; + font-size: 15px; + } } .mat-option.mat-selected { @@ -256,7 +260,7 @@ .mat-reset { .mat-form-field-type-mat-select:not(.mat-form-field-disabled) { .mat-form-field-flex { - line-height: 20px; + line-height: 18px; } } .mat-form-field { @@ -266,7 +270,7 @@ width: 275px; border: 0; font-family: 'Open Sans', sans-serif; - font-size: 16px; + font-size: 15px; font-weight: 300; .mat-select-value-text { span { diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index a6ff705158..78972f4aa5 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -134,6 +134,11 @@ mat-chip.mat-chip strong { pointer-events: none; } +.not-active { + cursor: not-allowed; + opacity: .6; +} + .message { padding: 40px 20px; text-align: center; From dcb63d6abc032c9cbc62d85670584fa5e20e5cc9 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Sat, 1 Jun 2019 09:59:34 +0300 Subject: [PATCH 118/357] [DLAB-655]: fixed roles markup --- .../administration/roles/roles.component.html | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html index 778de7b29d..1cca02f39f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html @@ -17,11 +17,17 @@ ~ under the License. --> -
- - +
+
+
+ +
+
+
+ + Groups
From 806e955d3dd6b90b682587d53d86c93d938e6eff Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Sun, 2 Jun 2019 22:39:03 +0300 Subject: [PATCH 119/357] [DLAB-655]: fix selects displaying --- .../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 2 +- .../src/main/resources/webapp/src/assets/styles/_theme.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index b09140561c..f163887018 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -239,4 +239,4 @@ mat-dialog-container { .dialog-header { padding-left: 45px !important; } -} \ No newline at end of file +} diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 1c69be9528..a95efee627 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -260,7 +260,7 @@ .mat-reset { .mat-form-field-type-mat-select:not(.mat-form-field-disabled) { .mat-form-field-flex { - line-height: 18px; + line-height: 1; } } .mat-form-field { @@ -272,6 +272,7 @@ font-family: 'Open Sans', sans-serif; font-size: 15px; font-weight: 300; + padding-top: 10px; .mat-select-value-text { span { color: #607d8b; From 27db2a71906ca0803b1b276df4f7e53725fbd629 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 3 Jun 2019 11:29:30 +0300 Subject: [PATCH 120/357] [DLAB-655]: added projects during env creation; 1 by 1 loading --- ...y-environment-create-dialog.component.html | 60 +++---- ...ory-environment-create-dialog.component.ts | 146 +++++------------- 2 files changed, 73 insertions(+), 133 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html index fa55bc9c4b..0ff5bbdd1c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html @@ -24,10 +24,7 @@

Create analytical tool

-
- +
@@ -48,10 +45,10 @@

Create analytical tool

Select template - + + (click)="getShapes(template)"> {{ template.exploratory_environment_versions[0].template_name }} @@ -67,7 +64,7 @@

Create analytical tool

Select {{ DICTIONARY.image }} - + None {{ image.name }} @@ -81,14 +78,14 @@

Create analytical tool

- - This name already exists. - Name + + This name already exists. + Name cannot be longer than 10 characters and can only contain letters, numbers, hyphens and '_' but can not end with special characters
@@ -101,7 +98,7 @@

Create analytical tool

Select {{ DICTIONARY.notebook_instance_size }} - + {{ list_item.Size }} {{ list_item.Type }} @@ -113,24 +110,29 @@

Create analytical tool

-
- -
- - Configuration parameters is not in a valid format +
+
+ +
+ + Configuration parameters is not in a valid format +
+ + Spark default configuration for Apache Zeppelin can not be changed from DLab UI. Currently it can be done directly through Apache Zeppelin interpreter menu. + For more details please refer for Apache Zeppelin official documentation. + +
- - Spark default configuration for Apache Zeppelin can not be changed from DLab UI. Currently it can be done directly through Apache Zeppelin interpreter menu. - For more details please refer for Apache Zeppelin official documentation. - -
- +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts index ea04b92a97..54e22deddc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts @@ -17,14 +17,13 @@ * under the License. */ -import { Component, OnInit, EventEmitter, Output, ViewChild, ChangeDetectorRef, Inject } from '@angular/core'; +import { Component, OnInit, ViewChild, ChangeDetectorRef, Inject } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import { Project } from '../../../administration/project/project.component'; -import { ExploratoryEnvironmentCreateModel } from './exploratory-environment-create.model'; import { UserResourceService, ProjectService } from '../../../core/services'; import { CheckUtils, HTTP_STATUS_CODES } from '../../../core/util'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; @@ -38,28 +37,17 @@ import { CLUSTER_CONFIGURATION } from '../../computational/computational-resourc export class ExploratoryEnvironmentCreateComponent implements OnInit { readonly DICTIONARY = DICTIONARY; - projects: Project[] =[]; + projects: Project[] = []; templates = []; currentTemplate: any; shapes: Array = []; - - model: ExploratoryEnvironmentCreateModel; - templateDescription: string; namePattern = '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+'; resourceGrid: any; images: Array; - environment_shape: string; - public createExploratoryForm: FormGroup; - // @ViewChild('environment_name') environment_name; - // @ViewChild('templatesList') templates_list; - // @ViewChild('shapesList') shapes_list; - // @ViewChild('imagesList') userImagesList; @ViewChild('configurationNode') configuration; - @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); - constructor( @Inject(MAT_DIALOG_DATA) public data: any, public toastr: ToastrService, @@ -69,28 +57,14 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { private changeDetector: ChangeDetectorRef, private projectService: ProjectService ) { - this.model = ExploratoryEnvironmentCreateModel.getDefault(userResourceService); this.resourceGrid = data; } ngOnInit() { this.getProjects(); - this.initFormModel(); } - initFormModel(): void { - this.createExploratoryForm = this._fb.group({ - project: [''], - template_name: [''], - image: [''], - shape: [''], - environment_name: ['', [Validators.required, Validators.pattern(this.namePattern), - this.providerMaxLength, this.checkDuplication.bind(this)]], - configuration_parameters: ['', [this.validConfiguration.bind(this)]] - }); - } - public getProjects() { this.projectService.getProjectsList().subscribe((projects: any) => this.projects = projects); } @@ -99,90 +73,24 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { this.userResourceService.getExploratoryTemplates($event.value).subscribe(templates => this.templates = templates); } - public getShapes($event, template) { + public getShapes(template) { this.currentTemplate = template; this.shapes = template.exploratory_environment_shapes; this.getImagesList(); } - providerMaxLength(control) { - if (DICTIONARY.cloud_provider !== 'aws') - return control.value.length <= 10 ? null : { valid: false }; - } + public createExploratoryEnvironment(data) { + const parameters: any = { + image: this.currentTemplate.image, + template_name: this.currentTemplate.exploratory_environment_versions[0].template_name + }; - private validConfiguration(control) { - if (this.configuration) - return this.configuration.nativeElement['checked'] - ? (control.value && control.value !== null && CheckUtils.isJSON(control.value) ? null : { valid: false }) - : null; - } - - checkDuplication(control) { - if (this.resourceGrid.containsNotebook(control.value)) - return { duplication: true }; + data.cluster_config = data.cluster_config ? JSON.parse(data.cluster_config) : null + this.userResourceService.createExploratoryEnvironment({...parameters, ...data}).subscribe((response: any) => { + if (response.status === HTTP_STATUS_CODES.OK) this.dialogRef.close(); + }, error => this.toastr.error(error.message || 'Exploratory creation failed!', 'Oops!')); } - shapePlaceholder(resourceShapes, byField: string): string { - for (const index in resourceShapes) - return resourceShapes[index][0][byField]; - } - - // setDefaultParams(): void { - // this.environment_shape = this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'type'); - - // this.templates_list.setDefaultOptions(this.model.exploratoryEnvironmentTemplates, - // this.model.selectedItem.template_name, 'template', 'template_name', 'array'); - // this.shapes_list.setDefaultOptions(this.model.selectedItem.shapes.resourcesShapeTypes, - // this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'description'), 'shape', 'description', 'json'); - - // if (this.userImages && this.userImages.length > 0) { - // this.userImagesList.setDefaultOptions(this.userImages, 'Select existing ' + DICTIONARY.image, 'ami', 'name', 'array', null, true); - // } - // } - - // onUpdate($event): void { - // if ($event.model.type === 'template') { - // this.model.setSelectedTemplate($event.model.index); - // this.shapes_list.setDefaultOptions(this.model.selectedItem.shapes.resourcesShapeTypes, - // this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'description'), 'shape', 'description', 'json'); - // this.environment_shape = this.shapePlaceholder(this.model.selectedItem.shapes.resourcesShapeTypes, 'type'); - - // this.getImagesList(); - // } - - // if ($event.model.type === 'shape') - // this.environment_shape = $event.model.value.type; - // } - - public selectImage($event): void { - debugger; - // this.model.notebookImage = $event.model.value ? $event.model.value.fullName : null; - } - - createExploratoryEnvironment_btnClick($event, data) { - this.model.setCreatingParams( - data.environment_name, - this.environment_shape, - data.configuration_parameters ? JSON.parse(data.configuration_parameters) : null); - this.model.confirmAction(); - $event.preventDefault(); - return false; - } - - // public open(params?): void { - // this.model = new ExploratoryEnvironmentCreateModel('', '', '', '', '', - // response => { - // if (response.status === HTTP_STATUS_CODES.OK) this.dialogRef.close(); - // }, - // error => this.toastr.error(error.message || 'Exploratory creation failed!', 'Oops!'), - // () => this.templateDescription = this.model.selectedItem.description, - // () => { - // this.initFormModel(); - // // this.setDefaultParams(); - // this.getImagesList(); - // }, - // this.userResourceService); - // } public selectConfiguration() { const value = (this.configuration.nativeElement.checked && this.createExploratoryForm) @@ -191,9 +99,39 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { this.createExploratoryForm.controls['configuration_parameters'].setValue(value); } + private initFormModel(): void { + + this.createExploratoryForm = this._fb.group({ + project: ['', Validators.required], + version: ['', Validators.required], + notebook_image_name: [''], + shape: ['', Validators.required], + name: ['', [Validators.required, Validators.pattern(this.namePattern), + this.providerMaxLength, this.checkDuplication.bind(this)]], + cluster_config: ['', [this.validConfiguration.bind(this)]] + }); + } + private getImagesList() { this.userResourceService.getUserImages(this.currentTemplate.image) .subscribe((res: any) => this.images = res.filter(el => el.status === 'CREATED'), error => this.toastr.error(error.message || 'Images list loading failed!', 'Oops!')); } + + private checkDuplication(control) { + if (this.resourceGrid.containsNotebook(control.value)) + return { duplication: true }; + } + + private providerMaxLength(control) { + if (DICTIONARY.cloud_provider !== 'aws') + return control.value.length <= 10 ? null : { valid: false }; + } + + private validConfiguration(control) { + if (this.configuration) + return this.configuration.nativeElement['checked'] + ? (control.value && control.value !== null && CheckUtils.isJSON(control.value) ? null : { valid: false }) + : null; + } } From 64339f6467c4131252ca4a1f7c99bd43fb0579c0 Mon Sep 17 00:00:00 2001 From: bhliva Date: Mon, 3 Jun 2019 11:29:48 +0300 Subject: [PATCH 121/357] DLAB-000 added endpoint field to exploratory form --- .../resources/dto/ExploratoryCreateFormDTO.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java index 53357d5498..2cb334488c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java @@ -46,6 +46,10 @@ public class ExploratoryCreateFormDTO { @JsonProperty private String project; + @NotBlank + @JsonProperty + private String endpoint; + @NotBlank @JsonProperty private String shape; @@ -156,6 +160,14 @@ public void setProject(String project) { this.project = project; } + public String getEndpoint() { + return endpoint; + } + + public void setEndpoint(String endpoint) { + this.endpoint = endpoint; + } + @Override public String toString() { return MoreObjects.toStringHelper(this) From 9c78057246c60630c39a01e3f0a8ee4e8c67c461 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 3 Jun 2019 13:42:30 +0300 Subject: [PATCH 122/357] [DLAB-655]: added endpoints to env creation; --- .../webapp/src/app/core/util/index.ts | 1 + .../webapp/src/app/core/util/patterns.ts | 2 +- .../create-environment.component.scss | 5 + ...y-environment-create-dialog.component.html | 21 ++- ...ory-environment-create-dialog.component.ts | 18 +- .../exploratory-environment-create.model.ts | 156 ------------------ .../webapp/src/assets/styles/_general.scss | 2 +- .../webapp/src/assets/styles/_theme.scss | 3 +- 8 files changed, 38 insertions(+), 170 deletions(-) delete mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create.model.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts index 6dccb52aa0..35462c046e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts @@ -23,3 +23,4 @@ export * from './errorUtils'; export * from './dateUtils'; export * from './fileUtils'; export * from './checkUtils'; +export * from './patterns'; diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts index 3cb9b12efb..071bb84351 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts @@ -18,5 +18,5 @@ */ export const PATTERNS = { - + namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+', } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss index f5b20c8da5..c63436cba8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss @@ -54,4 +54,9 @@ right: 0; bottom: 3px; } +} + +.content-box { + max-height: 560px; + overflow-y: auto; } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html index 0ff5bbdd1c..7f0d4407e3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html @@ -30,8 +30,23 @@

Create analytical tool

Select project - - {{ project.name }} + + {{ project.name }} + + + +
+
+ +
+ +
+ + Select endpoint + + {{ endpoint }}
From d7f402a4ac7aeb0de54e282040f436c418369625 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 3 Jun 2019 16:26:45 +0300 Subject: [PATCH 126/357] [DLAB-655]: fixrd issue with hirizontal scrolling on projects list --- .../resources/webapp/src/assets/styles/_theme.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 03dc54f2b6..4d5c5c1854 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -289,6 +289,9 @@ .mat-form-field-label { padding-top: 0; color: #607d8b; + mat-label { + vertical-align: middle; + } } .mat-select { &:focus { @@ -486,3 +489,10 @@ mat-horizontal-stepper { } } } + +.mat-table { + .mat-cell { + word-break: break-all; + padding: 5px 10px; + } +} \ No newline at end of file From 79d4bde97f1fb78d1d0ea3e31c46352066407f2a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 3 Jun 2019 16:30:50 +0300 Subject: [PATCH 127/357] [DLAB-741]: fixed label on projects page --- .../project/project-form/project-form.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 2057a6213a..7791faceca 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -73,7 +73,7 @@ - Users + Groups
From 41b38a6a534fffe4baffff61323e56e387d05851 Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 4 Jun 2019 11:10:42 +0300 Subject: [PATCH 128/357] DLAB-000 added endpoint property to user instance dto --- .../src/main/java/com/epam/dlab/dto/UserInstanceDTO.java | 7 +++++++ .../java/com/epam/dlab/model/exploratory/Exploratory.java | 1 + .../java/com/epam/dlab/backendapi/dao/ProjectDAO.java | 3 +++ .../java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java | 8 ++++++++ .../dlab/backendapi/resources/ExploratoryResource.java | 4 +++- .../backendapi/service/impl/ExploratoryServiceImpl.java | 3 ++- 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java index b50994209d..1cb4efc936 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java @@ -53,6 +53,8 @@ public class UserInstanceDTO { private String imageVersion; @JsonProperty("project") private String project; + @JsonProperty("endpoint") + private String endpoint; @JsonProperty("template_name") private String templateName; @JsonProperty @@ -167,4 +169,9 @@ public UserInstanceDTO withLibs(List libs) { setLibs(libs); return this; } + + public UserInstanceDTO withEndpoint(String endpoint) { + setEndpoint(endpoint); + return this; + } } diff --git a/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java b/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java index 923adab353..dd8dcbbdb0 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java @@ -34,5 +34,6 @@ public class Exploratory { private final String templateName; private final String shape; private final String imageName; + private final String endpoint; private final List clusterConfig; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index 26f49208b7..f7d4ce255b 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Optional; +import java.util.Set; public interface ProjectDAO { List getProjects(); @@ -19,4 +20,6 @@ public interface ProjectDAO { Optional getAllowedBudget(String project); void updateBudget(String project, Integer budget); + + boolean anyProjectAssigned(Set groups); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index 478cebd1e4..3d2bc022b6 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -6,12 +6,15 @@ import java.util.List; import java.util.Optional; +import java.util.Set; import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Filters.in; public class ProjectDAOImpl extends BaseDAO implements ProjectDAO { private static final String PROJECTS_COLLECTION = "Projects"; + private static final String GROUPS = "groups"; @Override public List getProjects() { @@ -49,6 +52,11 @@ public void updateBudget(String project, Integer budget) { updateOne(PROJECTS_COLLECTION, projectCondition(project), new Document(SET, new Document("budget", budget))); } + @Override + public boolean anyProjectAssigned(Set groups) { + return false; + } + private Bson projectCondition(String name) { return eq("name", name); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java index be7ad6a92e..e6aa295c47 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java @@ -167,6 +167,8 @@ private Exploratory getExploratory(ExploratoryCreateFormDTO formDTO) { .templateName(formDTO.getTemplateName()) .version(formDTO.getVersion()) .clusterConfig(formDTO.getClusterConfig()) - .shape(formDTO.getShape()).build(); + .shape(formDTO.getShape()) + .endpoint(formDTO.getEndpoint()) + .build(); } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java index a03f9c9138..0489f7164a 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java @@ -320,7 +320,8 @@ private UserInstanceDTO getUserInstanceDTO(UserInfo userInfo, Exploratory explor .withTemplateName(exploratory.getTemplateName()) .withClusterConfig(exploratory.getClusterConfig()) .withShape(exploratory.getShape()) - .withProject(project); + .withProject(project) + .withEndpoint(exploratory.getEndpoint()); if (StringUtils.isNotBlank(exploratory.getImageName())) { final List libInstallDtoList = getImageRelatedLibraries(userInfo, exploratory .getImageName()); From 6919636061f23b3b42d59d0bd5f149e381096c6d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 4 Jun 2019 11:40:08 +0300 Subject: [PATCH 129/357] [DLAB-741]: replaces roles grid --- .../administration/roles/roles.component.html | 67 +++++++++++-------- .../administration/roles/roles.component.scss | 33 ++++++++- .../administration/roles/roles.component.ts | 1 + 3 files changed, 71 insertions(+), 30 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html index 1cca02f39f..0c9193662f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html @@ -93,26 +93,26 @@ +
- - - - - - - - - - + +
NameRolesUsersAction
{{ item.group }} + + + + + + + + + - + - + - + + + +
Group name {{element.group}} Roles
- - + playlist_add_check All - + clear None @@ -126,35 +126,46 @@
+ + + + Users -
- + {{ user }} - clear + clear
- + - + + + + delete_forever + + + done +
+ diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss index b28c061c3d..4285e20eb1 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss @@ -29,6 +29,7 @@ right: 0; top: 0px; height: 36px; + line-height: 1; cursor: pointer; &.not-allowed { background-color: #dcdcdc; @@ -164,7 +165,7 @@ margin-top: 50px; height: inherit; min-height: 0; - overflow-y: hidden; + overflow: hidden; } } .expanded-panel { @@ -242,7 +243,6 @@ mat-expansion-panel-header { max-width: 100%; overflow: hidden; text-overflow: ellipsis; - margin: 2px !important; } mat-chip.mat-chip a { position: absolute; @@ -290,3 +290,32 @@ mat-form-field.chip-list { } } } + +table { + width: 100%; + .name { + width: 15%; + } + .roles { + width: 30%; + } + .users { + width: 40%; + } + .actions { + color: #607d8b; + width: 10%; + text-align: center; + span { + transition: all .5s ease-in-out; + cursor: pointer; + .mat-icon { + font-size: 18px; + padding-top: 5px; + } + &:hover { + color: darken(#607d8b, 10%); + } + } + } +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts index 8bc7b8d951..b5dce66bbb 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts @@ -44,6 +44,7 @@ export class RolesComponent implements OnInit { public delimitersRegex = /[-_]?/g; public groupnamePattern = new RegExp(/^[a-zA-Z0-9_\-]+$/); + displayedColumns: string[] = ['name', 'roles', 'users', 'actions']; @Output() manageRolesGroupAction: EventEmitter<{}> = new EventEmitter(); stepperView: boolean = false; From 4f47daf54b0c9a433de0dd7276eca031d86a6258 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 4 Jun 2019 11:41:19 +0300 Subject: [PATCH 130/357] [DLAB-741]: fixed issue with removing projects --- .../notification-dialog/notification-dialog.component.ts | 6 +++++- .../main/resources/webapp/src/assets/styles/_theme.scss | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts index d4a70ad5fc..6faf8713c8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts @@ -49,7 +49,10 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
-

{{ data.item.name }} will be decommissioned.

+

+ + {{ data.item.name }} will be decommissioned. +

Do you want to proceed?

@@ -69,6 +72,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; header a i { font-size: 20px; } header a:hover i { color: #35afd5; cursor: pointer; } .plur { font-style: normal; } + .label-name { display: inline-block; width: 100% } `] }) export class NotificationDialogComponent { diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 4d5c5c1854..22a3abade1 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -253,7 +253,7 @@ .mat-chip-list { .mat-chip-list-wrapper { overflow-y: auto; - max-height: 115px; + max-height: 130px; } } } @@ -491,6 +491,12 @@ mat-horizontal-stepper { } .mat-table { + th.mat-header-cell { + font-size: 15px; + font-family: 'Open Sans', sans-serif; + font-weight: 600; + color: #607D8B; + } .mat-cell { word-break: break-all; padding: 5px 10px; From 72c4a8617f3d29439c1ed659afd722c318e54830 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 4 Jun 2019 13:02:17 +0300 Subject: [PATCH 131/357] [DLAB-741]: manage roles fixes --- .../administration/roles/roles.component.html | 1 - .../administration/roles/roles.component.scss | 1 - .../administration/roles/roles.component.ts | 47 +++++++++---------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html index 0c9193662f..8ea280de56 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html @@ -48,7 +48,6 @@ Roles
- diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss index 4285e20eb1..a7d1478dc2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss @@ -36,7 +36,6 @@ } } - .content-box { padding: 20px 30px 35px; height: 85vh; diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts index b5dce66bbb..16e5a67f1e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts @@ -22,7 +22,7 @@ import { ValidatorFn, FormControl } from '@angular/forms'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; -import { RolesGroupsService } from '../../core/services'; +import { RolesGroupsService, HealthStatusService } from '../../core/services'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @Component({ @@ -41,27 +41,36 @@ export class RolesComponent implements OnInit { public manageUser: string = ''; public setupRoles: Array = []; public updatedRoles: Array = []; + public healthStatus: any; public delimitersRegex = /[-_]?/g; public groupnamePattern = new RegExp(/^[a-zA-Z0-9_\-]+$/); - + + stepperView: boolean = false; displayedColumns: string[] = ['name', 'roles', 'users', 'actions']; @Output() manageRolesGroupAction: EventEmitter<{}> = new EventEmitter(); - stepperView: boolean = false; constructor( public toastr: ToastrService, public dialog: MatDialog, - private rolesService: RolesGroupsService + private rolesService: RolesGroupsService, + private healthStatusService: HealthStatusService ) { } ngOnInit() { - this.openManageRolesDialog() + this.openManageRolesDialog(); + this.getEnvironmentHealthStatus(); } openManageRolesDialog() { - this.rolesService.getGroupsData().subscribe(group => { + this.rolesService.getGroupsData().subscribe(groups => { this.rolesService.getRolesData().subscribe( - roles => this.open(group, roles), + (roles: any) => { + this.roles = roles; + this.rolesList = roles.map(role => role.description); + this.updateGroupData(groups); + + this.stepperView = false; + }, error => this.toastr.error(error.message, 'Oops!')); }, error => this.toastr.error(error.message, 'Oops!')); @@ -73,23 +82,6 @@ export class RolesComponent implements OnInit { error => this.toastr.error(error.message, 'Oops!')); } - public open(groups, roles): void { - this.roles = roles; - this.rolesList = roles.map(role => role.description); - this.updateGroupData(groups); - - this.stepperView = false; - } - - public onUpdate($event) { - if ($event.type === 'role') { - this.setupRoles = $event.model; - } else { - this.updatedRoles = $event.model; - } - $event.$event.preventDefault(); - } - public selectAllOptions(item, values, byKey?) { byKey ? (item[byKey] = values ? values : []) : this.setupRoles = values ? values : []; } @@ -128,7 +120,7 @@ export class RolesComponent implements OnInit { this.resetDialog(); } - manageRolesGroups($event) { + public manageRolesGroups($event) { switch ($event.action) { case 'create': this.rolesService.setupNewGroup($event.value).subscribe(res => { @@ -215,6 +207,11 @@ export class RolesComponent implements OnInit { item.users instanceof Array ? item.users.push(value.trim()) : item.users = [value.trim()]; } } + + private getEnvironmentHealthStatus() { + this.healthStatusService.getEnvironmentHealthStatus() + .subscribe((result: any) => this.healthStatus = result); + } } From 8f082f66fae54f29cd9d3b6bfca0005e0020b471 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 4 Jun 2019 13:56:25 +0300 Subject: [PATCH 132/357] [DLAB-386]: manage role form card fixes --- .../project/project.component.scss | 18 --- .../project/project.component.ts | 3 +- .../administration/roles/roles.component.html | 128 +++++++++--------- 3 files changed, 66 insertions(+), 83 deletions(-) delete mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss deleted file mode 100644 index 7220975503..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.scss +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 6a1f7a95b0..c41ab275f2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -34,8 +34,7 @@ export interface Project { @Component({ selector: 'dlab-project', - templateUrl: './project.component.html', - styleUrls: ['./project.component.scss'] + templateUrl: './project.component.html' }) export class ProjectComponent implements OnInit, OnDestroy { projectList: Project[] = []; diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html index 8ea280de56..fe499ae46e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html @@ -27,70 +27,72 @@
- - - Groups -
- -
Group name can only - contain letters, numbers, hyphens and '_'
-
Group name already - exists
-
-
- - -
- - - Roles -
-
- - - - - playlist_add_check All - - - clear None - - - - {{ role }} - - - - + + + + Groups +
+ +
Group name can only + contain letters, numbers, hyphens and '_'
+
Group name already + exists
+
+
+ + +
+ + + Roles +
+
+ + + + + playlist_add_check All + + + clear None + + + + {{ role }} + + + + +
+
+
+ + + +
+ + + Users +
+ +
+
+ + +
-
-
- - - -
- - - Users -
- -
-
- - - -
- - + + +
From b708f4b375e9d5d011fc25f2d67e821ba40dbe03 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 4 Jun 2019 14:10:27 +0300 Subject: [PATCH 133/357] [DLAB-386]: change marckup; fixed empty lists default options --- .../project/project-form/project-form.component.html | 4 ++-- .../src/app/administration/project/project.component.html | 7 +++---- .../exploratory-environment-create-dialog.component.html | 8 ++++---- .../src/main/resources/webapp/src/styles.scss | 3 +++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 7791faceca..85ea1c5409 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -53,7 +53,7 @@ {{ endpoint.name }} - Endpoints list is empty + Endpoints list is empty
- - +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html index b5b9687cc4..432e71d4fc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html @@ -32,7 +32,7 @@

Create analytical tool

Select project {{ project.name }} - Projects list is empty + Projects list is empty +
- -
- -
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss index 9a49606bc7..ed6e478ef8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss @@ -20,16 +20,19 @@ .content-box { padding: 10px 30px 30px; height: 380px; - display: flex; - flex-direction: column; - justify-content: space-between; - form { - padding: 20px 10px; - .control-group { - .error { - position: absolute; - right: 0; - bottom: 5px; + .split { + display: flex; + flex-direction: column; + justify-content: space-between; + height: 100%; + form { + padding: 20px 10px; + .control-group { + .error { + position: absolute; + right: 0; + bottom: 5px; + } } } } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 22a3abade1..037ee29605 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -501,4 +501,11 @@ mat-horizontal-stepper { word-break: break-all; padding: 5px 10px; } +} + +mat-tab-group.mat-tab-group { + height: 100%; + .mat-tab-body-wrapper { + height: 100%; + } } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 78f7f632ce..c765793d44 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -280,9 +280,7 @@ input[type='number'] { .m-top-10p { margin-top: 10%; } -.ml-10 { - margin-left: 10px; -} +.ml-10 { margin-left: 10px; } .full-height { height: 100%; From c1b1fe6bd42fdc8508bd226510f59942696c7f06 Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 4 Jun 2019 14:49:35 +0300 Subject: [PATCH 135/357] DLAB-742 fixed authorization issue --- .../src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java index a1fabd1ccc..a8800e2ea7 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRoles.java @@ -253,7 +253,7 @@ private boolean hasAccessByGroup(UserInfo userInfo, UserRole role, Collection group = role.getGroups() .stream() - .filter(g -> userRoles.contains(g) && userGroups.getOrDefault(g, Collections.emptySet()).contains(userInfo.getName())) + .filter(g -> userGroups.getOrDefault(g, Collections.emptySet()).contains(userInfo.getName())) .findAny(); if (group.isPresent()) { LOGGER.trace("Got access by local group {}", group.get()); From 8bfbdd742828d5a36bb9a76dfa02f4dc51826bce Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 4 Jun 2019 15:39:28 +0300 Subject: [PATCH 136/357] [DLAB-738]: fixed select all action on multiselect list --- .../project-form/project-form.component.ts | 3 +- .../project-list/project-list.component.html | 57 +++++++++---------- .../project/project.component.html | 3 + .../administration/roles/roles.component.scss | 3 - .../webapp/src/assets/styles/_theme.scss | 3 + 5 files changed, 35 insertions(+), 34 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 9cdc780d19..4c0e92fba2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -87,7 +87,8 @@ export class ProjectFormComponent implements OnInit { } public selectOptions(list, key, select?) { - this.projectForm.controls[key].setValue(select ? list : []); + let filter = key === 'endpoints' ? list.map(el => el.name) : list; + this.projectForm.controls[key].setValue(select ? filter : []); } private initFormModel(): void { diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index fd8f90749f..c22c700a1a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -17,38 +17,35 @@ ~ under the License. --> -
+ + + + + -
Project name {{element.name}}
- - - - + + + + - - - - + + + + - - - - + + + - - - + - - - - -
Project name {{element.name}} Endpoints {{element.endpoints}} Endpoints {{element.endpoints}} Groups {{element.groups}} Groups {{element.groups}} + + mode_edit + + + delete_forever + + - - mode_edit - - - delete_forever - -
-
\ No newline at end of file +
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index d8f10ab27b..3bb39ecf1c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -31,10 +31,13 @@
+ + +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss index a7d1478dc2..eb33091dd7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss @@ -44,9 +44,6 @@ .no-details { color: #d8d8d8; } -.mat-divider { - margin: 10px 0; -} .stepper { height: 190px; margin-top: 10px; diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 037ee29605..1ad54ce67f 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -508,4 +508,7 @@ mat-tab-group.mat-tab-group { .mat-tab-body-wrapper { height: 100%; } +} +mat-divider.mat-divider { + margin: 10px 0; } \ No newline at end of file From 51168a5c8ffb3fa11146e815d602013774c5b989 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 4 Jun 2019 16:33:40 +0300 Subject: [PATCH 137/357] [DLAB-738]: added project duplication validation --- .../project-form/project-form.component.html | 1 + .../project-form/project-form.component.scss | 11 ++++-- .../project-form/project-form.component.ts | 37 ++++++++++++++----- .../webapp/src/app/core/util/checkUtils.ts | 6 +++ .../webapp/src/app/core/util/patterns.ts | 1 + 5 files changed, 43 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 85ea1c5409..b3880fefe0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -30,6 +30,7 @@
+ This project name already exists.
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss index 981fd5d136..5a7d3e3e67 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss @@ -19,9 +19,6 @@ .form-block { width: 600px; - .next { - // margin-left: 25px; - } &.split { flex-direction: column; display: flex; @@ -35,4 +32,12 @@ } } } + + .error { + font-family: 'Open Sans', sans-serif; + position: absolute; + right: 0; + bottom: 2px; + font-weight: 300; + } } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 4c0e92fba2..5a1e2eae1d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -17,13 +17,15 @@ * under the License. */ - import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core'; - import { FormGroup, FormBuilder, Validators } from '@angular/forms'; - import { ToastrService } from 'ngx-toastr'; +import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { ToastrService } from 'ngx-toastr'; +import { Subscription } from 'rxjs'; - import { ProjectService,RolesGroupsService, EndpointService } from '../../../core/services'; - import { ProjectDataService } from '../project-data.service'; - import { Project } from '../project.component'; +import { ProjectService, RolesGroupsService, EndpointService } from '../../../core/services'; +import { ProjectDataService } from '../project-data.service'; +import { CheckUtils, PATTERNS } from '../../../core/util'; +import { Project } from '../project.component'; @Component({ selector: 'project-form', @@ -31,16 +33,18 @@ styleUrls: ['./project-form.component.scss'] }) export class ProjectFormComponent implements OnInit { - namePattern = '[-_a-zA-Z0-9]+'; public projectForm: FormGroup; public groupsList: any = []; public endpointsList: any = []; + public projectList: Project[] = []; @Input() item: any; @Output() update: EventEmitter<{}> = new EventEmitter(); @ViewChild('stepper') stepper; + private subscriptions: Subscription = new Subscription(); + constructor( public toastr: ToastrService, private _fb: FormBuilder, @@ -55,6 +59,10 @@ export class ProjectFormComponent implements OnInit { this.getGroupsData(); this.getEndpointsData(); + this.subscriptions.add(this.projectDataService._projects.subscribe( + (value: Project[]) => { + if (value) this.projectList = value; + })); if (this.item) { this.editSpecificProject(this.item); this.stepper.selectedIndex = 1; @@ -82,7 +90,7 @@ export class ProjectFormComponent implements OnInit { } public generateProjectTag($event) { - let user_tag = `dlab-${ $event.target.value }`; + let user_tag = `dlab-${$event.target.value}`; this.projectForm.controls.tag.setValue(user_tag.toLowerCase()); } @@ -93,9 +101,9 @@ export class ProjectFormComponent implements OnInit { private initFormModel(): void { this.projectForm = this._fb.group({ - 'name': ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], + 'name': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern), this.checkDuplication.bind(this)])], 'endpoints': [[], Validators.required], - 'tag': ['',Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], + 'tag': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern)])], 'groups': [[], Validators.required] }); } @@ -121,4 +129,13 @@ export class ProjectFormComponent implements OnInit { list => this.endpointsList = list, error => this.toastr.error(error.message, 'Oops!')); } + + private checkDuplication(control) { + if (control.value) { + for (let index = 0; index < this.projectList.length; index++) { + if (CheckUtils.delimitersFiltering(control.value) === CheckUtils.delimitersFiltering(this.projectList[index].name)) + return { duplication: true }; + } + } + } } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/checkUtils.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/checkUtils.ts index 36f8a63ffa..bad67643bf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/checkUtils.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/checkUtils.ts @@ -17,6 +17,8 @@ * under the License. */ +import { PATTERNS } from './patterns'; + export class CheckUtils { public static isJSON(str) { try { @@ -35,4 +37,8 @@ export class CheckUtils { } return true; } + + public static delimitersFiltering(resource): string { + return resource.replace(PATTERNS.delimitersRegex, '').toString().toLowerCase(); + } } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts index 071bb84351..c68d7641f2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts @@ -19,4 +19,5 @@ export const PATTERNS = { namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+', + delimitersRegex: '/[-_]?/g' } From f774b65bce8cb341398e2f51546a7c1724e531b4 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 4 Jun 2019 17:26:39 +0300 Subject: [PATCH 138/357] [DLAB-735]: added endpoints validation --- .../management/endpoints/endpoints.component.ts | 8 ++++---- .../project/project-form/project-form.component.html | 4 ++++ .../project/project-form/project-form.component.scss | 2 -- .../main/resources/webapp/src/app/core/util/patterns.ts | 5 +++-- .../src/main/resources/webapp/src/styles.scss | 2 ++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts index da41791148..0d44188354 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts @@ -24,6 +24,7 @@ import { ToastrService } from 'ngx-toastr'; import { EndpointService } from '../../../core/services'; import { NotificationDialogComponent } from '../../../shared/modal-dialog/notification-dialog'; +import { PATTERNS } from '../../../core/util'; export interface Endpoint { name: string; @@ -38,7 +39,6 @@ export interface Endpoint { }) export class EndpointsComponent implements OnInit { public createEndpointForm: FormGroup; - namePattern = '[-_a-zA-Z0-9]+'; endpoints: Endpoint[] = []; displayedColumns: string[] = ['name', 'url', 'account', 'actions']; @@ -75,9 +75,9 @@ export class EndpointsComponent implements OnInit { private initFormModel(): void { this.createEndpointForm = this._fb.group({ - name: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], - url: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], - account: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])] + name: ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern)])], + url: ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.url)])], + account: ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern)])] }); } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index b3880fefe0..92c003ee61 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -31,6 +31,10 @@ This project name already exists. + Project name can only contain letters, numbers, hyphens and '_' but can not end with special characters +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss index 5a7d3e3e67..4c241e941b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss @@ -34,10 +34,8 @@ } .error { - font-family: 'Open Sans', sans-serif; position: absolute; right: 0; bottom: 2px; - font-weight: 300; } } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts index c68d7641f2..f78e7e6550 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts @@ -5,7 +5,7 @@ * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -19,5 +19,6 @@ export const PATTERNS = { namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+', - delimitersRegex: '/[-_]?/g' + delimitersRegex: '/[-_]?/g', + url: '^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$' } diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index c765793d44..1136d98584 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -126,6 +126,8 @@ mat-chip.mat-chip strong { .error { color: #f1696e; font-size: 12px; + font-family: 'Open Sans', sans-serif; + font-weight: 300; } .not-allowed { cursor: not-allowed !important; From 4d2401c9f956feeff2f0d2340d0de0e96eef52d4 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 13:03:48 +0300 Subject: [PATCH 139/357] [DLAB-735]: replased url validation pattern --- .../src/main/resources/webapp/src/app/core/util/patterns.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts index f78e7e6550..c82bb554d2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts @@ -20,5 +20,5 @@ export const PATTERNS = { namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+', delimitersRegex: '/[-_]?/g', - url: '^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$' + url: '[-_a-zA-Z0-9/:.#]*[_-]*[a-zA-Z0-9]+' } From 0377bffa6f15d9083349c8b71dd7c55817fcfde0 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 13:06:55 +0300 Subject: [PATCH 140/357] [DLAB-735]: actions list selector fixes --- .../resources-grid.component.css | 24 +++++++++---------- .../resources-grid.component.html | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css index ec1d129caf..406e726d6b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css @@ -131,11 +131,11 @@ font-size: 12px; } -.dashboard_table .status { +.data-grid .status { text-transform: capitalize; } -.dashboard_table .list-menu { +.data-grid .list-menu { left: auto; margin-left: 0; right: 15px; @@ -165,7 +165,7 @@ cursor: pointer; } -.dashboard_table .list-menu li { +.data-grid .list-menu li { font-size: 14px; border-bottom: 1px solid #edf1f5; padding: 12px 15px; @@ -174,44 +174,44 @@ color: #577289; transition: all 0.45s ease-in-out; } -.dashboard_table .list-menu a.navigate { +.data-grid .list-menu a.navigate { text-decoration: none; color: #577289; transition: all 0.45s ease-in-out; } -.dashboard_table .list-menu li i { +.data-grid .list-menu li i { font-size: 18px; padding-right: 5px; vertical-align: bottom; } -.dashboard_table .list-menu li:hover, -.dashboard_table .list-menu li:hover a { +.data-grid .list-menu li:hover, +.data-grid .list-menu li:hover a { background: none !important; color: #36afd5; } -.dashboard_table .list-menu li:last-child { +.data-grid .list-menu li:last-child { border-bottom: 0; } -.dashboard_table .list-menu ul { +.data-grid .list-menu ul { margin-bottom: 0; } -.dashboard_table .list-menu .active-items li { +.data-grid .list-menu .active-items li { border-bottom: 1px solid #edf1f5; } -.dashboard_table .message_block { +.data-grid .message_block { background: #edf6f9; } .message_block td { text-align: left !important; } -.dashboard_table .total_cost { +.data-grid .total_cost { display: inline-block; width: 70%; color: #455c74; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 2c4e497433..05f8761663 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -17,7 +17,7 @@ ~ under the License. --> - +
From ff44aef7e4084c57eb0796f617c69c70e4af1d9d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 13:17:49 +0300 Subject: [PATCH 141/357] [DLAB-735]: management grid component replacement --- .../endpoints/endpoints.component.html | 2 +- .../management-grid.component.html | 121 +++++++++++++++++- .../management-grid.component.scss | 7 + .../management-grid.component.ts | 1 + .../management/management.component.html | 48 +++---- .../project-list/project-list.component.ts | 1 - .../webapp/src/assets/styles/_theme.scss | 3 +- 7 files changed, 150 insertions(+), 33 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html index 8673787408..da4ed96fc9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html @@ -34,7 +34,7 @@

Create endpoint

+ *ngIf="!createEndpointForm?.controls.name.valid && createEndpointForm?.controls.name.touched"> Endpoint name can only contain letters, numbers, hyphens and '_' but can not end with special characters diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index 4998f464c4..bd6efa4af0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -17,7 +17,7 @@ ~ under the License. --> - + \ No newline at end of file + --> + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
User {{ element.user }} Type {{ element.name }} Shape / Resource id {{ element.shape || element.ip }} Status {{ element.status }} Computational resources +
+
+ no details +
+ +
+ 		+ + +
    +
  • +
    + pause_circle_outline + Stop +
    +
    • +
  • +
    + phonelink_off + Terminate +
    +
    • + +
    +
  • + play_circle_outline + Start +
    • +
  • + refresh + Recreate +
    • +
  • + sync_problem + Reupload key +
    • +
    +
+ +
+ +
\ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss index 6198578416..e2f7646cff 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss @@ -38,3 +38,10 @@ .source .resource-wrap .resource-name .detailed-link { cursor: default !important; } + +table { + width: 100%; + .actions { + text-align: right; + } +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts index 0c630dfece..937a8b82cd 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts @@ -52,6 +52,7 @@ export class ManagementGridComponent implements OnInit { @Output() refreshGrid: EventEmitter<{}> = new EventEmitter(); @Output() actionToggle: EventEmitter = new EventEmitter(); + displayedColumns: string[] = ['user', 'type', 'shape', 'status', 'resources', 'actions']; @ViewChild('keyReuploadDialog') keyReuploadDialog; constructor( diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index b46549b17f..e77144fbc1 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -17,28 +17,30 @@ ~ under the License. --> -
-
- - - - + + + +
+
- - - - - + + + + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index daf82a7761..1870b5954b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -56,7 +56,6 @@ export class ProjectListComponent implements OnInit, OnDestroy { } public editProject(item: Project[]) { - ; this.editItem.emit(item); } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 1ad54ce67f..bd29aea1ff 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -499,7 +499,8 @@ mat-horizontal-stepper { } .mat-cell { word-break: break-all; - padding: 5px 10px; + vertical-align: initial; + padding: 10px 5px; } } From 94851312f2308f0182f0f7e08e83babbfe70b370 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 14:02:17 +0300 Subject: [PATCH 142/357] [DLAB-747]: cleanup status and keys check from resources list --- .../management-grid.component.html | 138 ------------------ .../create-environment.component.html} | 0 .../create-environment.component.scss | 0 .../create-environment.component.ts} | 4 +- .../index.ts | 6 +- .../app/resources/resources.component.html | 12 +- .../src/app/resources/resources.component.ts | 57 ++------ .../src/app/resources/resources.module.ts | 2 +- .../webapp/src/assets/styles/_theme.scss | 2 +- 9 files changed, 23 insertions(+), 198 deletions(-) rename services/self-service/src/main/resources/webapp/src/app/resources/exploratory/{exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html => create-environment/create-environment.component.html} (100%) rename services/self-service/src/main/resources/webapp/src/app/resources/exploratory/{exploratory-environment-create-dialog => create-environment}/create-environment.component.scss (100%) rename services/self-service/src/main/resources/webapp/src/app/resources/exploratory/{exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts => create-environment/create-environment.component.ts} (97%) rename services/self-service/src/main/resources/webapp/src/app/resources/exploratory/{exploratory-environment-create-dialog => create-environment}/index.ts (87%) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index bd6efa4af0..5d68686d34 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -17,144 +17,6 @@ ~ under the License. --> - -
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/create-environment.component.scss rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts similarity index 97% rename from services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts index 2b2f40b20f..e17dac4e2b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts @@ -29,8 +29,8 @@ import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import { CLUSTER_CONFIGURATION } from '../../computational/computational-resource-create-dialog/cluster-configuration-templates'; @Component({ - selector: 'exploratory-environment-create-dialog', - templateUrl: 'exploratory-environment-create-dialog.component.html', + selector: 'create-environment', + templateUrl: 'create-environment.component.html', styleUrls: ['./create-environment.component.scss'] }) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/index.ts similarity index 87% rename from services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/index.ts index 91e1ee4edc..9175d9cd7d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/index.ts @@ -23,8 +23,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../../shared/material.module'; import { FormControlsModule } from '../../../shared/form-controls'; -import { ExploratoryEnvironmentCreateComponent } from './exploratory-environment-create-dialog.component'; -import { KeysPipeModule, UnderscorelessPipeModule } from './../../../core/pipes'; +import { ExploratoryEnvironmentCreateComponent } from './create-environment.component'; +import { KeysPipeModule, UnderscorelessPipeModule } from '../../../core/pipes'; + +export * from './create-environment.component'; @NgModule({ imports: [ diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index dbaea8338a..be44a59371 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -19,7 +19,7 @@
-
@@ -41,12 +41,4 @@
-
- priority_high - Error happened during user access key upload. Please try to reupload the key. -
- - - - - + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts index fd44bcf276..f6725cf68e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts @@ -23,11 +23,10 @@ import { ToastrService } from 'ngx-toastr'; import { MatDialog } from '@angular/material'; import { ResourcesGridComponent } from './resources-grid/resources-grid.component'; -import { ExploratoryEnvironmentCreateComponent } from './exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component'; +import { ExploratoryEnvironmentCreateComponent } from './exploratory/create-environment'; import { ResourcesGridRowModel } from './resources-grid/resources-grid.model'; -import { UserAccessKeyService, HealthStatusService } from '../core/services'; +import { HealthStatusService } from '../core/services'; import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; -import { HTTP_STATUS_CODES, FileUtils } from '../core/util'; @Component({ selector: 'dlab-resources', @@ -35,52 +34,25 @@ import { HTTP_STATUS_CODES, FileUtils } from '../core/util'; styleUrls: ['./resources.component.scss'] }) -export class ResourcesComponent implements OnInit, OnDestroy { - - public userUploadAccessKeyState: number; +export class ResourcesComponent implements OnInit { public exploratoryEnvironments: Array = []; public healthStatus: any; - @ViewChild('createAnalyticalModal') createAnalyticalModal; - // @ViewChild('manageUngitDialog') manageUngitDialog; @ViewChild(ResourcesGridComponent) resourcesGrid: ResourcesGridComponent; - subscriptions: Subscription = new Subscription(); - constructor( public toastr: ToastrService, - private userAccessKeyService: UserAccessKeyService, private healthStatusService: HealthStatusService, private dialog: MatDialog - ) { - this.userUploadAccessKeyState = HTTP_STATUS_CODES.NOT_FOUND; - } + ) { } ngOnInit() { this.getEnvironmentHealthStatus(); - // this.createAnalyticalModal.resourceGrid = this.resourcesGrid; - - this.subscriptions.add(this.userAccessKeyService.accessKeyEmitter.subscribe(response => { - if (response) this.userUploadAccessKeyState = response.status; - })); - this.subscriptions.add(this.userAccessKeyService.keyUploadProccessEmitter.subscribe(response => { - if (response) this.refreshGrid(); - })); } - ngOnDestroy() { - this.subscriptions.unsubscribe(); - } - - public createNotebook_btnClick(): void { - if (this.userUploadAccessKeyState === HTTP_STATUS_CODES.OK) { - // if (!this.createAnalyticalModal.isOpened) this.createAnalyticalModal.open({ isFooter: false }); - - this.dialog.open(ExploratoryEnvironmentCreateComponent, { data: this.resourcesGrid, panelClass: 'modal-lg' }) - .afterClosed().subscribe(() => this.refreshGrid()); - } else { - this.userAccessKeyService.initialUserAccessKeyCheck(); - } + public createEnvironment(): void { + this.dialog.open(ExploratoryEnvironmentCreateComponent, { data: this.resourcesGrid, panelClass: 'modal-lg' }) + .afterClosed().subscribe(() => this.refreshGrid()); } public refreshGrid(): void { @@ -98,19 +70,16 @@ export class ResourcesComponent implements OnInit, OnDestroy { } public manageUngit(): void { - // if (!this.manageUngitDialog.isOpened) - // this.manageUngitDialog.open({ isFooter: false }); - this.dialog.open(ManageUngitComponent, {panelClass: 'modal-xxl'}) - .afterClosed().subscribe(() => this.refreshGrid()); + this.dialog.open(ManageUngitComponent, { panelClass: 'modal-xxl' }) + .afterClosed().subscribe(() => this.refreshGrid()); } private getEnvironmentHealthStatus() { this.healthStatusService.getEnvironmentHealthStatus().subscribe( - (result: any) => { - this.healthStatus = result; - this.resourcesGrid.healthStatus = this.healthStatus; - this.userAccessKeyService.initialUserAccessKeyCheck(); - }, + (result: any) => { + this.healthStatus = result; + this.resourcesGrid.healthStatus = this.healthStatus; + }, error => this.toastr.error(error.message, 'Oops!')); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts index 4c5f96b1b5..9f3e25dc93 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts @@ -24,7 +24,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../shared/material.module'; import { ResourcesComponent } from './resources.component'; import { ResourcesGridModule } from './resources-grid'; -import { ExploratoryEnvironmentCreateModule } from './exploratory/exploratory-environment-create-dialog'; +import { ExploratoryEnvironmentCreateModule } from './exploratory/create-environment'; import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; import { ConfirmDeleteAccountDialog } from './manage-ungit/manage-ungit.component'; diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index bd29aea1ff..301f6aed96 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -499,7 +499,7 @@ mat-horizontal-stepper { } .mat-cell { word-break: break-all; - vertical-align: initial; + vertical-align: top; padding: 10px 5px; } } From 9af7f103627317bb26530d4b289f5a9769d74086 Mon Sep 17 00:00:00 2001 From: bhliva Date: Wed, 5 Jun 2019 14:53:57 +0300 Subject: [PATCH 143/357] DLAB-746 added API for checking whether used is assigned to project --- .../epam/dlab/backendapi/dao/ProjectDAO.java | 2 +- .../dlab/backendapi/dao/ProjectDAOImpl.java | 5 +++-- .../dlab/backendapi/dao/UserGroupDao.java | 2 ++ .../dlab/backendapi/dao/UserGroupDaoImpl.java | 9 +++++++++ .../resources/InfrastructureInfoResource.java | 2 +- .../resources/dto/HealthStatusPageDTO.java | 11 +++++++++++ .../service/InfrastructureInfoService.java | 3 ++- .../backendapi/service/ProjectService.java | 3 +++ .../impl/InfrastructureInfoServiceBase.java | 9 ++++++++- .../service/impl/ProjectServiceImpl.java | 19 ++++++++++++++++++- .../InfrastructureInfoResourceTest.java | 17 +++++++++-------- .../InfrastructureInfoServiceBaseTest.java | 9 +++++++-- 12 files changed, 74 insertions(+), 17 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index f7d4ce255b..9939bc56c4 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -21,5 +21,5 @@ public interface ProjectDAO { void updateBudget(String project, Integer budget); - boolean anyProjectAssigned(Set groups); + boolean isAnyProjectAssigned(Set groups); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index 3d2bc022b6..3fd5e6b438 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -1,6 +1,7 @@ package com.epam.dlab.backendapi.dao; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.google.common.collect.Iterables; import org.bson.Document; import org.bson.conversions.Bson; @@ -53,8 +54,8 @@ public void updateBudget(String project, Integer budget) { } @Override - public boolean anyProjectAssigned(Set groups) { - return false; + public boolean isAnyProjectAssigned(Set groups) { + return !Iterables.isEmpty(find(PROJECTS_COLLECTION, in(GROUPS, groups))); } private Bson projectCondition(String name) { diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDao.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDao.java index d8fb8ecc01..0a4dde58c6 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDao.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDao.java @@ -29,4 +29,6 @@ public interface UserGroupDao { void removeGroup(String groupId); + Set getUserGroups(String user); + } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDaoImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDaoImpl.java index a8e5a15910..350f6a298a 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDaoImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDaoImpl.java @@ -22,9 +22,11 @@ import org.bson.Document; import java.util.Set; +import java.util.stream.Collectors; import static com.epam.dlab.backendapi.dao.MongoCollections.USER_GROUPS; import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Filters.in; @Singleton public class UserGroupDaoImpl extends BaseDAO implements UserGroupDao { @@ -50,4 +52,11 @@ public void removeUser(String group, String user) { public void removeGroup(String groupId) { deleteOne(USER_GROUPS, eq(ID, groupId)); } + + @Override + public Set getUserGroups(String user) { + return stream(find(USER_GROUPS, in(USERS_FIELD, user))) + .map(document -> document.getString(ID)) + .collect(Collectors.toSet()); + } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java index 6b44c33cac..daec244a60 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java @@ -73,7 +73,7 @@ public HealthStatusPageDTO status(@ApiParam(hidden = true) @Auth UserInfo userIn @ApiParam(value = "Full version of report required", defaultValue = "0") @QueryParam("full") @DefaultValue("0") int fullReport) { return infrastructureInfoService - .getHeathStatus(userInfo.getName(), fullReport != 0, UserRoles.isAdmin(userInfo)); + .getHeathStatus(userInfo, fullReport != 0, UserRoles.isAdmin(userInfo)); } /** diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/HealthStatusPageDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/HealthStatusPageDTO.java index cdef1bbbdd..b7f936267e 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/HealthStatusPageDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/HealthStatusPageDTO.java @@ -40,6 +40,8 @@ public class HealthStatusPageDTO { private int billingQuoteUsed; @JsonProperty private int billingUserQuoteUsed; + @JsonProperty + private boolean projectAssigned; /** * Return the status of environment. @@ -83,6 +85,11 @@ public HealthStatusPageDTO withStatus(HealthStatusEnum status) { return this; } + public HealthStatusPageDTO withProjectAssinged(boolean isProjectAssigned) { + this.projectAssigned = isProjectAssigned; + return this; + } + /** * Return the list of resources. */ @@ -146,6 +153,10 @@ public boolean isAdmin() { return admin; } + public boolean isProjectAssigned() { + return projectAssigned; + } + public int getBillingQuoteUsed() { return billingQuoteUsed; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java index b54edb9227..64e45be3da 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java @@ -19,6 +19,7 @@ package com.epam.dlab.backendapi.service; +import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; import com.epam.dlab.dto.InfrastructureMetaInfoDTO; @@ -26,7 +27,7 @@ public interface InfrastructureInfoService { InfrastructureInfo getUserResources(String user); - HealthStatusPageDTO getHeathStatus(String user, boolean fullReport, boolean isAdmin); + HealthStatusPageDTO getHeathStatus(UserInfo user, boolean fullReport, boolean isAdmin); InfrastructureMetaInfoDTO getInfrastructureMetaInfo(); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index 2e221e15ed..bde43b2a1d 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -1,5 +1,6 @@ package com.epam.dlab.backendapi.service; +import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; import java.util.List; @@ -16,4 +17,6 @@ public interface ProjectService { void update(ProjectDTO projectDTO); void updateBudget(String project, Integer budget); + + boolean isAnyProjectAssigned(UserInfo userInfo); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java index a5d1465ab8..919a5fc749 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java @@ -19,6 +19,7 @@ package com.epam.dlab.backendapi.service.impl; +import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.SelfServiceApplicationConfiguration; import com.epam.dlab.backendapi.dao.BillingDAO; import com.epam.dlab.backendapi.dao.EnvDAO; @@ -27,6 +28,7 @@ import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; import com.epam.dlab.backendapi.service.InfrastructureInfoService; +import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.dto.InfrastructureMetaInfoDTO; import com.epam.dlab.dto.base.edge.EdgeInfo; import com.epam.dlab.exceptions.DlabException; @@ -52,6 +54,8 @@ public abstract class InfrastructureInfoServiceBase implements Infrastructure private SelfServiceApplicationConfiguration configuration; @Inject private BillingDAO billingDAO; + @Inject + private ProjectService projectService; @SuppressWarnings("unchecked") @@ -73,12 +77,15 @@ public InfrastructureInfo getUserResources(String user) { } @Override - public HealthStatusPageDTO getHeathStatus(String user, boolean fullReport, boolean isAdmin) { + public HealthStatusPageDTO getHeathStatus(UserInfo userInfo, boolean fullReport, boolean isAdmin) { + final String user = userInfo.getName(); log.debug("Request the status of resources for user {}, report type {}", user, fullReport); try { + return envDAO.getHealthStatusPageDTO(user, fullReport) .withBillingEnabled(configuration.isBillingSchedulerEnabled()) .withAdmin(isAdmin) + .withProjectAssinged(projectService.isAnyProjectAssigned(userInfo)) .withBillingQuoteUsed(billingDAO.getBillingQuoteUsed()) .withBillingUserQuoteUsed(billingDAO.getBillingUserQuoteUsed(user)); } catch (Exception e) { diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index bceb5b9f99..d118844f9c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -1,6 +1,8 @@ package com.epam.dlab.backendapi.service.impl; +import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.dao.ProjectDAO; +import com.epam.dlab.backendapi.dao.UserGroupDao; import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.service.EnvironmentService; import com.epam.dlab.backendapi.service.ProjectService; @@ -9,17 +11,24 @@ import com.google.inject.Inject; import java.util.List; +import java.util.Set; import java.util.function.Supplier; +import static java.util.stream.Collectors.toSet; +import static java.util.stream.Stream.concat; + public class ProjectServiceImpl implements ProjectService { private final ProjectDAO projectDAO; private final EnvironmentService environmentService; + private final UserGroupDao userGroupDao; @Inject - public ProjectServiceImpl(ProjectDAO projectDAO, EnvironmentService environmentService) { + public ProjectServiceImpl(ProjectDAO projectDAO, EnvironmentService environmentService, + UserGroupDao userGroupDao) { this.projectDAO = projectDAO; this.environmentService = environmentService; + this.userGroupDao = userGroupDao; } @Override @@ -60,6 +69,14 @@ public void updateBudget(String project, Integer budget) { projectDAO.updateBudget(project, budget); } + @Override + public boolean isAnyProjectAssigned(UserInfo userInfo) { + final Set userGroups = concat(userInfo.getRoles().stream(), + userGroupDao.getUserGroups(userInfo.getName()).stream()) + .collect(toSet()); + return projectDAO.isAnyProjectAssigned(userGroups); + } + private Supplier projectNotFound() { return () -> new ResourceNotFoundException("Project with passed name not found"); } diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java index 30c69ff251..e2ab690dbf 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java @@ -19,6 +19,7 @@ package com.epam.dlab.backendapi.resources; +import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; import com.epam.dlab.backendapi.service.InfrastructureInfoService; @@ -85,7 +86,7 @@ public void statusWithFailedAuth() throws AuthenticationException { @Test public void healthStatus() { HealthStatusPageDTO hspDto = getHealthStatusPageDTO(); - when(infrastructureInfoService.getHeathStatus(anyString(), anyBoolean(), anyBoolean())).thenReturn(hspDto); + when(infrastructureInfoService.getHeathStatus(any(UserInfo.class), anyBoolean(), anyBoolean())).thenReturn(hspDto); final Response response = resources.getJerseyTest() .target("/infrastructure/status") .queryParam("full", "1") @@ -97,7 +98,7 @@ public void healthStatus() { assertEquals(hspDto.getStatus(), response.readEntity(HealthStatusPageDTO.class).getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureInfoService).getHeathStatus(eq(USER.toLowerCase()), eq(true), anyBoolean()); + verify(infrastructureInfoService).getHeathStatus(refEq(getUserInfo()), eq(true), anyBoolean()); verifyNoMoreInteractions(infrastructureInfoService); } @@ -105,7 +106,7 @@ public void healthStatus() { public void healthStatusWithFailedAuth() throws AuthenticationException { authFailSetup(); HealthStatusPageDTO hspDto = getHealthStatusPageDTO(); - when(infrastructureInfoService.getHeathStatus(anyString(), anyBoolean(), anyBoolean())).thenReturn(hspDto); + when(infrastructureInfoService.getHeathStatus(any(UserInfo.class), anyBoolean(), anyBoolean())).thenReturn(hspDto); final Response response = resources.getJerseyTest() .target("/infrastructure/status") .queryParam("full", "1") @@ -117,14 +118,14 @@ public void healthStatusWithFailedAuth() throws AuthenticationException { assertEquals(hspDto.getStatus(), response.readEntity(HealthStatusPageDTO.class).getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureInfoService).getHeathStatus(eq(USER.toLowerCase()), eq(true), anyBoolean()); + verify(infrastructureInfoService).getHeathStatus(refEq(getUserInfo()), eq(true), anyBoolean()); verifyNoMoreInteractions(infrastructureInfoService); } @Test public void healthStatusWithDefaultQueryParam() { HealthStatusPageDTO hspDto = getHealthStatusPageDTO(); - when(infrastructureInfoService.getHeathStatus(anyString(), anyBoolean(), anyBoolean())).thenReturn(hspDto); + when(infrastructureInfoService.getHeathStatus(any(UserInfo.class), anyBoolean(), anyBoolean())).thenReturn(hspDto); final Response response = resources.getJerseyTest() .target("/infrastructure/status") .request() @@ -135,14 +136,14 @@ public void healthStatusWithDefaultQueryParam() { assertEquals(hspDto.getStatus(), response.readEntity(HealthStatusPageDTO.class).getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureInfoService).getHeathStatus(eq(USER.toLowerCase()), eq(false), anyBoolean()); + verify(infrastructureInfoService).getHeathStatus(refEq(getUserInfo()), eq(false), anyBoolean()); verifyNoMoreInteractions(infrastructureInfoService); } @Test public void healthStatusWithException() { doThrow(new DlabException("Could not return status of resources for user")) - .when(infrastructureInfoService).getHeathStatus(anyString(), anyBoolean(), anyBoolean()); + .when(infrastructureInfoService).getHeathStatus(any(UserInfo.class), anyBoolean(), anyBoolean()); final Response response = resources.getJerseyTest() .target("/infrastructure/status") .request() @@ -152,7 +153,7 @@ public void healthStatusWithException() { assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getStatus()); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(infrastructureInfoService).getHeathStatus(eq(USER.toLowerCase()), eq(false), anyBoolean()); + verify(infrastructureInfoService).getHeathStatus(refEq(getUserInfo()), eq(false), anyBoolean()); verifyNoMoreInteractions(infrastructureInfoService); } diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java index aad8094418..2c7d1277ee 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java @@ -19,6 +19,7 @@ package com.epam.dlab.backendapi.service.impl; +import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.SelfServiceApplicationConfiguration; import com.epam.dlab.backendapi.dao.BillingDAO; import com.epam.dlab.backendapi.dao.EnvDAO; @@ -27,6 +28,7 @@ import com.epam.dlab.backendapi.resources.dto.HealthStatusEnum; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; +import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.dto.base.edge.EdgeInfo; import com.epam.dlab.exceptions.DlabException; import org.bson.Document; @@ -57,6 +59,8 @@ public class InfrastructureInfoServiceBaseTest { private SelfServiceApplicationConfiguration configuration; @Mock private BillingDAO billingDAO; + @Mock + private ProjectService projectService; @InjectMocks private InfrastructureInfoServiceBase infrastructureInfoServiceBase = spy(InfrastructureInfoServiceBase.class); @@ -109,11 +113,12 @@ public void getHeathStatus() { when(billingDAO.getBillingQuoteUsed()).thenReturn(10); HealthStatusPageDTO actualHealthStatusPageDTO = - infrastructureInfoServiceBase.getHeathStatus(USER, false, true); + infrastructureInfoServiceBase.getHeathStatus(new UserInfo(USER, "token"), false, true); assertNotNull(actualHealthStatusPageDTO); assertEquals(HealthStatusEnum.OK.toString(), actualHealthStatusPageDTO.getStatus()); assertFalse(actualHealthStatusPageDTO.isBillingEnabled()); assertTrue(actualHealthStatusPageDTO.isAdmin()); + assertFalse(actualHealthStatusPageDTO.isProjectAssigned()); assertEquals(10, actualHealthStatusPageDTO.getBillingQuoteUsed()); verify(envDAO).getHealthStatusPageDTO(USER, false); @@ -126,7 +131,7 @@ public void getHeathStatusWhenMethodGetHealthStatusPageDTOThrowsException() { doThrow(new DlabException("Cannot fetch health status!")) .when(envDAO).getHealthStatusPageDTO(anyString(), anyBoolean()); try { - infrastructureInfoServiceBase.getHeathStatus(USER, false, false); + infrastructureInfoServiceBase.getHeathStatus(new UserInfo(USER, null), false, false); } catch (DlabException e) { assertEquals("Cannot fetch health status!", e.getMessage()); } From 3569f9875287acb2458111eee3cb4860fc5ad9ba Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 16:27:13 +0300 Subject: [PATCH 144/357] [DLAB-747]: separate ssn monitor data service --- .../ssn-monitor/ssn-monitor.component.html | 5 ++++- .../ssn-monitor/ssn-monitor.component.ts | 15 ++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html index a4f9cf5617..6f2097507b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html @@ -23,7 +23,7 @@

SSN Monitor

-
+
@@ -114,5 +114,8 @@

SSN Monitor

No ssn monitor data available
+ +

Monitor data are not available

+
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts index 10212132a0..cbb7977009 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts @@ -17,10 +17,12 @@ * under the License. */ -import { Component, OnInit, ViewEncapsulation, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { MatDialogRef } from '@angular/material'; +import { ToastrService } from 'ngx-toastr'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; +import { HealthStatusService } from '../../../core/services'; @Component({ selector: 'dlab-ssn-monitor', @@ -32,15 +34,18 @@ export class SsnMonitorComponent implements OnInit { readonly DICTIONARY = DICTIONARY; public errorMessage: string = ''; - public monitorData = {}; + public data: any = null; constructor( - @Inject(MAT_DIALOG_DATA) public data: any, + public toastr: ToastrService, public dialogRef: MatDialogRef, + private healthStatusService: HealthStatusService, ) { } ngOnInit() { - this.monitorData = this.data || {}; + this.healthStatusService.getSsnMonitorData().subscribe( + monitorData => this.data = monitorData, + () => this.toastr.error('Failed ssn data loading!', 'Oops!')); } public isEmpty(obj) { From ffffdf882f70e05f00e079185ce9a70c7899dced Mon Sep 17 00:00:00 2001 From: Mykola Bodnar1 Date: Tue, 4 Jun 2019 18:25:15 +0300 Subject: [PATCH 145/357] README.md edited --- README.md | 183 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 136 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 88d49dee67..d4f879f238 100644 --- a/README.md +++ b/README.md @@ -250,7 +250,7 @@ If you want to deploy DLab from inside of your AWS account, you can use the foll - Create an EC2 instance with the following settings: - Shape of the instance shouldn't be less than t2.medium - - The instance should have access to Internet in order to install required prerequisites + - The instance should have access to Internet in order to install required prerequisites - The instance should have access to further DLab installation - AMI - Ubuntu 16.04 - IAM role with [policy](#AWS_SSN_policy) should be assigned to the instance @@ -264,6 +264,7 @@ If you want to deploy DLab from inside of your AWS account, you can use the foll apt-cache policy docker-ce apt-get install -y docker-ce=17.06.2~ce-0~ubuntu usermod -a -G docker ubuntu + apt-get install python-pip pip install fabric==1.14.0 ``` - Clone DLab repository and run deploy script. @@ -314,11 +315,78 @@ These directories contain the log files for each template and for DLab back-end ### Create -Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. +Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. #### In Amazon cloud +<<<<<<< HEAD +======= +Prerequisites: + + - SSH key for EC2 instances. This key could be created through Amazon Console. + - IAM user + - AWS access key ID and secret access key + - The following permissions should be assigned for IAM user: + +``` +{ + "Version": "2012-10-17", + "Statement": [ + { + "Action": [ + "iam:ListRoles", + "iam:CreateRole", + "iam:CreateInstanceProfile", + "iam:PutRolePolicy", + "iam:AddRoleToInstanceProfile", + "iam:PassRole", + "iam:GetInstanceProfile", + "iam:ListInstanceProfilesForRole", + "iam:RemoveRoleFromInstanceProfile", + "iam:DeleteInstanceProfile" + ], + "Effect": "Allow", + "Resource": "*" + }, + { + "Action": [ + "ec2:DescribeImages", + "ec2:CreateTags", + "ec2:DescribeRouteTables", + "ec2:CreateRouteTable", + "ec2:AssociateRouteTable", + "ec2:DescribeVpcEndpoints", + "ec2:CreateVpcEndpoint", + "ec2:ModifyVpcEndpoint", + "ec2:DescribeInstances", + "ec2:RunInstances", + "ec2:DescribeAddresses", + "ec2:AllocateAddress", + "ec2:DescribeInstances", + "ec2:AssociateAddress", + "ec2:DisassociateAddress", + "ec2:ReleaseAddress", + "ec2:TerminateInstances" + ], + "Effect": "Allow", + "Resource": "*" + }, + { + "Action": [ + "s3:ListAllMyBuckets", + "s3:CreateBucket", + "s3:PutBucketTagging", + "s3:GetBucketTagging" + ], + "Effect": "Allow", + "Resource": "*" + } + ] +} +``` + +>>>>>>> eb92433f3... README.md edited To build SSN node, following steps should be executed: 1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. @@ -339,7 +407,7 @@ List of parameters for SSN node deployment: | aws\_secret\_access\_key | AWS user secret access key | | aws\_region | AWS region | | conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (AWS) +| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (AWS) | conf\_duo\_vpc\_enable | "true" - for installing DLab into two Virtual Private Clouds (VPCs) or "false" - for installing DLab into one VPC. Also this parameter isn't required when deploy DLab in one VPC | aws\_vpc\_id | ID of the VPC | | aws\_subnet\_id | ID of the public subnet | @@ -375,6 +443,20 @@ After SSN node deployment following AWS resources will be created: #### In Azure cloud +<<<<<<< HEAD +======= +Prerequisites: + +- IAM user with Contributor permissions. +- Service principal and JSON based auth file with clientId, clientSecret and tenantId. + +**Note:** The following permissions should be assigned to the service principal: + +- Windows Azure Active Directory +- Microsoft Graph +- Windows Azure Service Management API + +>>>>>>> eb92433f3... README.md edited To build SSN node, following steps should be executed: 1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed @@ -435,9 +517,9 @@ azure\_currency, azure\_locale, azure\_region_info. These DLab deploy properties - Open *Azure Active Directory* tab, then *App registrations* and click *New application registration* - Fill in ui form with the following parameters *Name* - put name of the new application, *Application type* - select Native, *Sign-on URL* put any valid url as it will be updated later - Grant proper permissions to the application. Select the application you just created on *App registration* view, then click *Required permissions*, then *Add->Select an API-> In search field type MicrosoftAzureQueryService* and press *Select*, then check the box *Have full access to the Azure Data Lake service* and save the changes. Repeat the same actions for *Windows Azure Active Directory* API (available on *Required permissions->Add->Select an API*) and the box *Sign in and read user profile* -- Get *Application ID* from application properties it will be used as azure_application_id for deploy_dlap.py script +- Get *Application ID* from application properties it will be used as azure_application_id for deploy_dlap.py script 2. Usage of Data Lake resource predicts shared folder where all users can write or read any data. To manage access to this folder please create ot use existing group in Active Directory. All users from this group will have RW access to the shared folder. Put ID(in Active Directory) of the group as *azure_ad_group_id* parameter to deploy_dlab.py script -3. After execution of deploy_dlab.py script go to the application created in step 1 and change *Redirect URIs* value to the https://SSN_HOSTNAME/ where SSN_HOSTNAME - SSN node hostname +3. After execution of deploy_dlab.py script go to the application created in step 1 and change *Redirect URIs* value to the https://SSN_HOSTNAME/ where SSN_HOSTNAME - SSN node hostname After SSN node deployment following Azure resources will be created: @@ -449,10 +531,18 @@ After SSN node deployment following Azure resources will be created: - Virtual network and Subnet (if they have not been specified) for SSN and EDGE nodes - Storage account and blob container for necessary further dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) - Storage account and blob container for collaboration between Dlab users -- If support of Data Lake is enabled: Data Lake and shared directory will be created +- If support of Data Lake is enabled: Data Lake and shared directory will be created #### In Google cloud (GCP) +<<<<<<< HEAD +======= +Prerequisites: + +- IAM user +- Service account and JSON auth file for it. In order to get JSON auth file, Key should be created for service account through Google cloud console. + +>>>>>>> eb92433f3... README.md edited To build SSN node, following steps should be executed: 1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. @@ -608,7 +698,7 @@ The following Azure resources will be created: - Security Groups for all further user's master nodes of data engine cluster - Security Groups for all further user's slave nodes of data engine cluster - User's private subnet. All further nodes (Notebooks, data engine clusters) will be provisioned in different subnet than SSN. -- User's storage account and blob container +- User's storage account and blob container List of parameters for Edge node creation: @@ -635,7 +725,7 @@ The following GCP resources will be created: - Security Groups for all further user's master nodes of data engine cluster - Security Groups for all further user's slave nodes of data engine cluster - User's private subnet. All further nodes (Notebooks, data engine clusters) will be provisioned in different subnet than SSN. -- User's bucket +- User's bucket List of parameters for Edge node creation: @@ -993,7 +1083,7 @@ List of parameters for Notebook node to **get list** of available libraries: "pip2": {"requests": "N/A", "configparser": "N/A"}, "pip3": {"configparser": "N/A"}, "r_pkg": {"rmarkdown": "1.5"}, - "others": {"Keras": "N/A"} + "others": {"Keras": "N/A"} } ``` @@ -1269,7 +1359,7 @@ List of parameters for Dataengine-service node to **get list** of available libr "pip2": {"requests": "N/A", "configparser": "N/A"}, "pip3": {"configparser": "N/A"}, "r_pkg": {"rmarkdown": "1.5"}, - "others": {"Keras": "N/A"} + "others": {"Keras": "N/A"} } ``` @@ -1475,7 +1565,7 @@ List of parameters for Dataengine node to **get list** of available libraries: "pip2": {"requests": "N/A", "configparser": "N/A"}, "pip3": {"configparser": "N/A"}, "r_pkg": {"rmarkdown": "1.5"}, - "others": {"Keras": "N/A"} + "others": {"Keras": "N/A"} } ``` @@ -1708,7 +1798,7 @@ To deploy Gitlab server, set all needed parameters in ```gitlab.ini``` and run s **Note:** Terminate process uses ```node_name``` to find instance. -**Note:** GitLab wouldn't be terminated with all environment termination process. +**Note:** GitLab wouldn't be terminated with all environment termination process. ## Troubleshooting @@ -1843,12 +1933,12 @@ Some class names may have endings like Aws or Azure(e.g. ComputationalResourceAw #### Security service -Security service is REST based service for user authentication against LDAP/LDAP + AWS/Azure OAuth2 depending on module configuration and cloud provider. -LDAP only provides with authentication end point that allows to verify authenticity of users against LDAP instance. +Security service is REST based service for user authentication against LDAP/LDAP + AWS/Azure OAuth2 depending on module configuration and cloud provider. +LDAP only provides with authentication end point that allows to verify authenticity of users against LDAP instance. If you use AWS cloud provider LDAP + AWS authentication could be useful as it allows to combine LDAP authentication and verification if user has any role in AWS account DLab provides OAuth2(client credentials and authorization code flow) security authorization mechanism for Azure users. This kind of authentication is required when you are going to use Data Lake. If Data Lake is not enabled you have two options LDAP or OAuth2 -If OAuth2 is in use security-service validates user's permissions to configured permission scope(resource in Azure). +If OAuth2 is in use security-service validates user's permissions to configured permission scope(resource in Azure). If Data Lake is enabled default permission scope(can be configured manually after deploy DLab) is Data Lake Store account so only if user has any role in scope of Data Lake Store Account resource he/she will be allowed to log in If Data Lake is disabled but Azure OAuth2 is in use default permission scope will be Resource Group where DLab is created and only users who have any roles in the resource group will be allowed to log in. @@ -1867,7 +1957,7 @@ Sources are located in dlab/services/self-service/src/main/resources/webapp | Home page (list of resources) | HomeComponent
nested several main components like ResourcesGrid for notebooks data rendering and filtering, using custom MultiSelectDropdown component;
multiple modal dialogs components used for new instances creation, displaying detailed info and actions confirmation. | | Health Status page | HealthStatusComponent
*HealthStatusGridComponent* displays list of instances, their types, statutes, ID’s and uses *healthStatusService* for handling main actions. | | Help pages | Static pages that contains information and instructions on how to access Notebook Server and generate SSH key pair. Includes only *NavbarComponent*. | -| Error page | Simple static page letting users know that opened page does not exist. Includes only *NavbarComponent*. | +| Error page | Simple static page letting users know that opened page does not exist. Includes only *NavbarComponent*. | | Reporting page | ReportingComponent
ReportingGridComponent displays billing detailed info with built-in filtering and DateRangePicker component for custom range filtering;
uses *BillingReportService* for handling main actions and exports report data to .csv file. | ## How to setup local development environment @@ -1931,7 +2021,7 @@ mongo: *Unix* ``` -ln -s ../../infrastructure-provisioning/src/ssn/templates/ssn.yml ssn.yml +ln -s ../../infrastructure-provisioning/src/ssn/templates/ssn.yml ssn.yml ``` *Windows* @@ -1978,7 +2068,7 @@ export * from './(aws|azure).dictionary'; npm run build.prod ``` -### Prepare HTTPS prerequisites +### Prepare HTTPS prerequisites To enable a SSL connection the web server should have a Digital Certificate. To create a server certificate, follow these steps: @@ -1993,7 +2083,7 @@ To create a server certificate, follow these steps: Please find below set of commands to create certificate, depending on OS. -#### Create Unix/Ubuntu server certificate +#### Create Unix/Ubuntu server certificate Pay attention that the last command has to be executed with administrative permissions. ``` @@ -2387,7 +2477,7 @@ Also depending on customization, there might be differences in attributes config **CN** vs **UID**. -The relation between users and groups also varies from vendor to vendor. +The relation between users and groups also varies from vendor to vendor. For example, in Open LDAP the group object may contain set (from 0 to many) attributes **"memberuid"** with values equal to user`s attribute **“uid”**. @@ -2396,8 +2486,8 @@ On a group size there is attribute **"member"** (from 0 to many values) and its To fit the unified way of LDAP usage, we introduced configuration file with set of properties and customized scripts (python and JavaScript based). -On backend side, all valuable attributes are further collected and passed to these scripts. -To apply some customization it is required to update a few properties in **security.yml** and customize the scripts. +On backend side, all valuable attributes are further collected and passed to these scripts. +To apply some customization it is required to update a few properties in **security.yml** and customize the scripts. ### Properties overview @@ -2417,14 +2507,14 @@ Additional parameters that are populated during deployment and may be changed in - **ldapConnectionConfig.ldapHost: ldap host** - **ldapConnectionConfig.ldapPort: ldap port** - **ldapConnectionConfig.credentials: ldap credentials** - + ### Scripts overview There are 3 scripts in security.yml: -- **userLookUp** (python based) - responsible for user lookup in LDap and returns additional user`s attributes; +- **userLookUp** (python based) - responsible for user lookup in LDap and returns additional user`s attributes; - **userInfo** (python based) - enriches user with additional data; - **groupInfo** (javascript based) – responsible for mapping between users and groups; - + ### Script structure The scripts above were created to flexibly manage user`s security configuration. They all are part of **security.yml** configuration. All scripts have following structure: @@ -2439,14 +2529,14 @@ The scripts above were created to flexibly manage user`s security configuration. - **searchResultProcessor:** - **language** - **code** - -Major properties are: + +Major properties are: - **attributes** - list of attributes that will be retrieved from LDAP (-name, -cn, -uid, -member, etc); -- **filter** - the filter, based on which the object will be retrieved from LDAP; +- **filter** - the filter, based on which the object will be retrieved from LDAP; - **searchResultProcessor** - optional. If only LDAP object attributes retrieving is required, this property should be empty. For example, “userLookup” script only retrieves list of "attributes". Otherwise, code customization (like user enrichment, user to groups matching, etc.) should be added into sub-properties below: - - **language** - the script language - "python" or "JavaScript" + - **language** - the script language - "python" or "JavaScript" - **code** - the script code. - + ### "userLookUp" script @@ -2463,34 +2553,34 @@ Script code: expirationTimeMsec: 600000 scope: SUBTREE attributes: - - cn + - cn - gidNumber - mail - memberOf timeLimit: 0 base: ou=users,ou=alxn,dc=alexion,dc=cloud filter: "(&(objectCategory=person)(objectClass=user)(mail=%mail%))" - + In the example above, the user login passed from GUI is a mail (**ldapSearchAttribute: mail**) and based on the filer (**filter: "(&(objectCategory=person)(objectClass=user)(mail=%mail%))")** so, the service would search user by its **“mail”**. If corresponding users are found - the script will return additional user`s attributes: - cn - gidNumber - mail - memberOf - + User`s authentication into LDAP would be done for DN with following template **ldapBindTemplate: 'cn=%s,ou=users,ou=alxn,dc=alexion,dc=cloud'**, where CN is attribute retrieved by **“userLookUp”** script. ## Azure OAuth2 Authentication -DLab supports OAuth2 authentication that is configured automatically in Security Service and Self Service after DLab deployment. -Please see explanation details about configuration parameters for Self Service and Security Service below. -DLab supports client credentials(username + password) and authorization code flow for authentication. +DLab supports OAuth2 authentication that is configured automatically in Security Service and Self Service after DLab deployment. +Please see explanation details about configuration parameters for Self Service and Security Service below. +DLab supports client credentials(username + password) and authorization code flow for authentication. ### Azure OAuth2 Self Service configuration azureLoginConfiguration: useLdap: false - tenant: xxxx-xxxx-xxxx-xxxx + tenant: xxxx-xxxx-xxxx-xxxx authority: https://login.microsoftonline.com/ clientId: xxxx-xxxx-xxxx-xxxx redirectUrl: https://dlab.azure.cloudapp.azure.com/ @@ -2499,7 +2589,7 @@ DLab supports client credentials(username + password) and authorization code flo silent: true loginPage: https://dlab.azure.cloudapp.azure.com/ maxSessionDurabilityMilliseconds: 288000000 - + where: - **useLdap** - defines if LDAP authentication is enabled(true/false). If false Azure OAuth2 takes place with configuration properties below - **tenant** - tenant id of your company @@ -2508,25 +2598,25 @@ where: - **redirectUrl** - redirect URL to DLab application after try to login to Azure using OAuth2 - **responseMode** - defines how Azure sends authorization code or error information to DLab during log in procedure - **prompt** - defines kind of prompt during Oauth2 login -- **silent** - defines if DLab tries to log in user without interaction(true/false), if false DLab tries to login user with configured prompt +- **silent** - defines if DLab tries to log in user without interaction(true/false), if false DLab tries to login user with configured prompt - **loginPage** - start page of DLab application -- **maxSessionDurabilityMilliseconds** - max user session durability. user will be asked to login after this period of time and when he/she creates ot starts notebook/cluster. This operation is needed to update refresh_token that is used by notebooks to access Data Lake Store - +- **maxSessionDurabilityMilliseconds** - max user session durability. user will be asked to login after this period of time and when he/she creates ot starts notebook/cluster. This operation is needed to update refresh_token that is used by notebooks to access Data Lake Store + To get more info about *responseMode*, *prompt* parameters please visit [Authorize access to web applications using OAuth 2.0 and Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-protocols-oauth-code) - - + + ### Azure OAuth2 Security Service configuration azureLoginConfiguration: useLdap: false - tenant: xxxx-xxxx-xxxx-xxxx + tenant: xxxx-xxxx-xxxx-xxxx authority: https://login.microsoftonline.com/ clientId: xxxx-xxxx-xxxx-xxxx redirectUrl: https://dlab.azure.cloudapp.azure.com/ - validatePermissionScope: true + validatePermissionScope: true permissionScope: subscriptions/xxxx-xxxx-xxxx-xxxx/resourceGroups/xxxx-xxxx/providers/Microsoft.DataLakeStore/accounts/xxxx/providers/Microsoft.Authorization/ managementApiAuthFile: /dlab/keys/azure_authentication.json - + where: - **useLdap** - defines if LDAP authentication is enabled(true/false). If false Azure OAuth2 takes place with configuration properties below - **tenant** - tenant id of your company @@ -2536,4 +2626,3 @@ where: - **validatePermissionScope** - defines(true/false) if user's permissions should be validated to resource that is provided in permissionScope parameter. User will be logged in onlu in case he/she has any role in resource IAM described with permissionScope parameter - **permissionScope** - describes Azure resource where user should have any role to pass authentication. If user has no role in resource IAM he/she will not be logged in - **managementApiAuthFile** - authentication file that is used to query Microsoft Graph API to check user roles in resource described in permissionScope - From f9abe45feb0b66d4b9bfde97ecab4451e7be2853 Mon Sep 17 00:00:00 2001 From: Mykola Bodnar1 Date: Wed, 5 Jun 2019 13:27:42 +0300 Subject: [PATCH 146/357] Readme.md updated --- README.md | 124 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 110 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d4f879f238..ed30994ae3 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ Creation of self-service node – is the first step for deploying DLab. SSN is a Elastic(Static) IP address is assigned to an SSN Node, so you are free to stop|start it and and SSN node's IP address won’t change. +<<<<<<< HEAD ## Edge node Setting up Edge node is the first step that user is asked to do once logged into DLab. This node is used as proxy server and SSH gateway for the user. Through Edge node users can access Notebook via HTTP and SSH. Edge Node has a Squid HTTP web proxy pre-installed. @@ -270,6 +271,9 @@ If you want to deploy DLab from inside of your AWS account, you can use the foll - Clone DLab repository and run deploy script. ## Structure of main DLab directory +======= +### Structure of main DLab directory +>>>>>>> 84ff8aad0... README.md updated DLab’s SSN node main directory structure is as follows: @@ -290,7 +294,7 @@ DLab’s SSN node main directory structure is as follows: - webapp – contains all .jar files for DLab Web UI and back-end services. -## Structure of log directory +### Structure of log directory SSN node structure of log directory is as follows: @@ -311,9 +315,36 @@ These directories contain the log files for each template and for DLab back-end - selfservice.log – Self-Service log file; - edge, notebook, dataengine, dataengine-service – contains logs of Python scripts. +## Edge node + +Setting up Edge node is the first step that user is asked to do once logged into DLab. This node is used as proxy server and SSH gateway for the user. Through Edge node users can access Notebook via HTTP and SSH. Edge Node has a Squid HTTP web proxy pre-installed. + +## Notebook node + +The next step is setting up a Notebook node (or a Notebook server). It is a server with pre-installed applications and libraries for data processing, data cleaning and transformations, numerical simulations, statistical modeling, machine learning, etc. Following analytical tools are currently supported in DLab and can be installed on a Notebook node: + +- Jupyter +- RStudio +- Apache Zeppelin +- TensorFlow + Jupyter +- Deep Learning + Jupyter + +Apache Spark is also installed for each of the analytical tools above. + +**Note:** terms 'Apache Zeppelin' and 'Apache Spark' hereinafter may be referred to as 'Zeppelin' and 'Spark' respectively or may have original reference. + +## Data engine cluster + +After deploying Notebook node, user can create one of the cluster for it: +- Data engine - Spark standalone cluster +- Data engine service - cloud managed cluster platform (EMR for AWS or Dataproc for GCP) +That simplifies running big data frameworks, such as Apache Hadoop and Apache Spark to process and analyze vast amounts of data. Adding cluster is not mandatory and is only needed in case additional computational resources are required for job execution. +---------------------- +# DLab Deployment + ## Self-Service Node -### Create +### Preparing environment for DLab deployment Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. @@ -386,18 +417,78 @@ Prerequisites: } ``` +<<<<<<< HEAD >>>>>>> eb92433f3... README.md edited +======= +Preparation steps for deployment: + +- Create an EC2 instance with the following settings: + - The instance should have access to Internet in order to install required prerequisites + - The instance should have access to further DLab installation + - AMI - Ubuntu 16.04 + - IAM role with [policy](#AWS_SSN_policy) should be assigned to the instance +- Put SSH key file created through Amazon Console on the instance +- Install Git and clone DLab repository + +#### In Azure cloud + +Prerequisites: + +- IAM user with Contributor permissions. +- Service principal and JSON based auth file with clientId, clientSecret and tenantId. + +**Note:** The following permissions should be assigned to the service principal: + +- Windows Azure Active Directory +- Microsoft Graph +- Windows Azure Service Management API + +#### In Google cloud (GCP) + +Prerequisites: + +- Service account and JSON auth file for it. In order to get JSON auth file, Key should be created for service account through Google cloud console. +- Google Cloud Storage JSON API should be enabled + +Preparation steps for deployment: + +- Create an VM instance with the following settings: + - The instance should have access to Internet in order to install required prerequisites + - Boot disk OS Image - Ubuntu 16.04 +- Generate SSH key pair and rename private key with .pem extension +- Put JSON auth file created through Google cloud console to users home directory +- Install Git and clone DLab repository + +### Executing deployment script + +>>>>>>> 84ff8aad0... README.md updated To build SSN node, following steps should be executed: -1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. -2. Go to *dlab* directory. -3. Execute following script: +- Connect to the instance via SSH and run the following commands: + ``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXXXX --aws_region us-west-2 --conf_os_family debian --conf_cloud_provider aws --aws_vpc_id vpc-xxxxx --aws_subnet_id subnet-xxxxx --aws_security_groups_ids sg-xxxxx,sg-xxxx --key_path /root/ --conf_key_name Test --conf_tag_resource_id dlab --aws_account_id xxxxxxxx --aws_billing_bucket billing_bucket --aws_report_path /billing/directory/ --action create +sudo su +apt-get update +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - +add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" +apt-get update +apt-cache policy docker-ce +apt-get install -y docker-ce=17.06.2~ce-0~ubuntu +usermod -a -G docker *username* +apt-get install python-pip +pip install fabric==1.14.0 ``` +- Go to *dlab* directory +- Run deployment script: This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. +#### In Amazon cloud + +``` +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name XXXXXX --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXXXX --aws_region xx-xxxxx-x --conf_os_family debian --conf_cloud_provider aws --aws_vpc_id vpc-xxxxx --aws_subnet_id subnet-xxxxx --aws_security_groups_ids sg-xxxxx,sg-xxxx --key_path /path/to/key/ --conf_key_name key_name --conf_tag_resource_id dlab --aws_account_id xxxxxxxx --aws_billing_bucket billing_bucket --aws_report_path /billing/directory/ --action create +``` + List of parameters for SSN node deployment: | Parameter | Description/Value | @@ -443,6 +534,7 @@ After SSN node deployment following AWS resources will be created: #### In Azure cloud +<<<<<<< HEAD <<<<<<< HEAD ======= Prerequisites: @@ -464,12 +556,12 @@ To build SSN node, following steps should be executed: 3. To have working billing functionality please review Billing configuration note and use proper parameters for SSN node deployment 4. To use Data Lake Store please review Azure Data Lake usage pre-requisites note and use proper parameters for SSN node deployment 5. Execute following deploy_dlab.py script: +======= +>>>>>>> 84ff8aad0... README.md updated ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --azure_region westus2 --conf_os_family debian --conf_cloud_provider azure --azure_vpc_name vpc-test --azure_subnet_name subnet-test --azure_security_group_name sg-test1,sg-test2 --key_path /root/ --conf_key_name Test --azure_auth_path /dir/file.json --action create ``` -This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. - List of parameters for SSN node deployment: | Parameter | Description/Value | @@ -511,6 +603,9 @@ To know azure\_offer\_number open [Azure Portal](https://portal.azure.com), go t Please see [RateCard API](https://msdn.microsoft.com/en-us/library/mt219004.aspx) to get more details about azure\_offer\_number, azure\_currency, azure\_locale, azure\_region_info. These DLab deploy properties correspond to RateCard API request parameters. +To have working billing functionality please review Billing configuration note and use proper parameters for SSN node deployment +To use Data Lake Store please review Azure Data Lake usage pre-requisites note and use proper parameters for SSN node deployment + **Note:** Azure Data Lake usage pre-requisites: 1. Configure application in Azure portal and grant proper permissions to it. @@ -535,6 +630,7 @@ After SSN node deployment following Azure resources will be created: #### In Google cloud (GCP) +<<<<<<< HEAD <<<<<<< HEAD ======= Prerequisites: @@ -548,12 +644,12 @@ To build SSN node, following steps should be executed: 1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. 2. Go to *dlab* directory. 3. Execute following script: +======= +>>>>>>> 84ff8aad0... README.md updated ``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab --gcp_region us-west1 --gcp_zone us-west1-a --conf_os_family debian --conf_cloud_provider gcp --key_path /key/path/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xxx-xxxxx-x --conf_os_family debian --conf_cloud_provider gcp --key_path /path/to/key/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create ``` -This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. - List of parameters for SSN node deployment: | Parameter | Description/Value | @@ -586,14 +682,14 @@ After SSN node deployment following GCP resources will be created: - Bucket – its name will be \-ssn-bucket. This bucket will contain necessary dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) - Bucket for for collaboration between Dlab users. Its name will be \-shared-bucket -### Terminate +### Terminating Self-Service Node Terminating SSN node will also remove all nodes and components related to it. Basically, terminating Self-service node will terminate all DLab’s infrastructure. Example of command for terminating DLab environment: #### In Amazon ``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXX --aws_region us-west-2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider aws --action terminate +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXX --aws_region xx-xxxxx-x --key_path /path/to/key/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider aws --action terminate ``` List of parameters for SSN node termination: @@ -630,7 +726,7 @@ List of parameters for SSN node termination: #### In Google cloud ``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --gcp_project_id project_id --conf_service_base_name dlab --gcp_region us-west1 --gcp_zone us-west1-a --key_path /root/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider gcp --gcp_service_account_path /path/to/auth/file.json --action terminate +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --gcp_project_id project_id --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xx-xxxxx-x --key_path /path/to/key/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider gcp --gcp_service_account_path /path/to/auth/file.json --action terminate ``` List of parameters for SSN node termination: From 73909d72996a4d30801adc5f742a58c2dec22bd0 Mon Sep 17 00:00:00 2001 From: Mykola Bodnar1 Date: Wed, 5 Jun 2019 13:27:42 +0300 Subject: [PATCH 147/357] README.md updated1 --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index ed30994ae3..fa4d4d5c78 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ Creation of self-service node – is the first step for deploying DLab. SSN is a Elastic(Static) IP address is assigned to an SSN Node, so you are free to stop|start it and and SSN node's IP address won’t change. +<<<<<<< HEAD <<<<<<< HEAD ## Edge node @@ -274,6 +275,9 @@ If you want to deploy DLab from inside of your AWS account, you can use the foll ======= ### Structure of main DLab directory >>>>>>> 84ff8aad0... README.md updated +======= +### Structure of main DLab directory +>>>>>>> 84ff8aad0... README.md updated DLab’s SSN node main directory structure is as follows: @@ -417,9 +421,12 @@ Prerequisites: } ``` +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> eb92433f3... README.md edited ======= +======= +>>>>>>> 84ff8aad0... README.md updated Preparation steps for deployment: - Create an EC2 instance with the following settings: @@ -461,6 +468,9 @@ Preparation steps for deployment: ### Executing deployment script +<<<<<<< HEAD +>>>>>>> 84ff8aad0... README.md updated +======= >>>>>>> 84ff8aad0... README.md updated To build SSN node, following steps should be executed: @@ -534,6 +544,7 @@ After SSN node deployment following AWS resources will be created: #### In Azure cloud +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -558,6 +569,8 @@ To build SSN node, following steps should be executed: 5. Execute following deploy_dlab.py script: ======= >>>>>>> 84ff8aad0... README.md updated +======= +>>>>>>> 84ff8aad0... README.md updated ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --azure_region westus2 --conf_os_family debian --conf_cloud_provider azure --azure_vpc_name vpc-test --azure_subnet_name subnet-test --azure_security_group_name sg-test1,sg-test2 --key_path /root/ --conf_key_name Test --azure_auth_path /dir/file.json --action create ``` @@ -630,6 +643,7 @@ After SSN node deployment following Azure resources will be created: #### In Google cloud (GCP) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -646,6 +660,8 @@ To build SSN node, following steps should be executed: 3. Execute following script: ======= >>>>>>> 84ff8aad0... README.md updated +======= +>>>>>>> 84ff8aad0... README.md updated ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xxx-xxxxx-x --conf_os_family debian --conf_cloud_provider gcp --key_path /path/to/key/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create ``` From 0d2dc4e6db9e395577d2e9d42c376f5ed5a697fe Mon Sep 17 00:00:00 2001 From: Mykola Bodnar1 Date: Wed, 5 Jun 2019 13:37:56 +0300 Subject: [PATCH 148/357] README.md updated --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fa4d4d5c78..2facf9c183 100644 --- a/README.md +++ b/README.md @@ -496,7 +496,7 @@ This python script will build front-end and back-end part of DLab, create SSN do #### In Amazon cloud ``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name XXXXXX --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXXXX --aws_region xx-xxxxx-x --conf_os_family debian --conf_cloud_provider aws --aws_vpc_id vpc-xxxxx --aws_subnet_id subnet-xxxxx --aws_security_groups_ids sg-xxxxx,sg-xxxx --key_path /path/to/key/ --conf_key_name key_name --conf_tag_resource_id dlab --aws_account_id xxxxxxxx --aws_billing_bucket billing_bucket --aws_report_path /billing/directory/ --action create +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXXXX --aws_region xx-xxxxx-x --conf_os_family debian --conf_cloud_provider aws --aws_vpc_id vpc-xxxxx --aws_subnet_id subnet-xxxxx --aws_security_groups_ids sg-xxxxx,sg-xxxx --key_path /path/to/key/ --conf_key_name key_name --conf_tag_resource_id dlab --aws_account_id xxxxxxxx --aws_billing_bucket billing_bucket --aws_report_path /billing/directory/ --action create ``` List of parameters for SSN node deployment: @@ -616,8 +616,9 @@ To know azure\_offer\_number open [Azure Portal](https://portal.azure.com), go t Please see [RateCard API](https://msdn.microsoft.com/en-us/library/mt219004.aspx) to get more details about azure\_offer\_number, azure\_currency, azure\_locale, azure\_region_info. These DLab deploy properties correspond to RateCard API request parameters. -To have working billing functionality please review Billing configuration note and use proper parameters for SSN node deployment -To use Data Lake Store please review Azure Data Lake usage pre-requisites note and use proper parameters for SSN node deployment +To have working billing functionality please review Billing configuration note and use proper parameters for SSN node deployment. + +To use Data Lake Store please review Azure Data Lake usage pre-requisites note and use proper parameters for SSN node deployment. **Note:** Azure Data Lake usage pre-requisites: From 7591b2b345c394bf1ad125b0ab12fbdefa15e768 Mon Sep 17 00:00:00 2001 From: Mykola Bodnar1 Date: Wed, 5 Jun 2019 15:04:01 +0300 Subject: [PATCH 149/357] README.md updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2facf9c183..13504ab53b 100644 --- a/README.md +++ b/README.md @@ -434,7 +434,7 @@ Preparation steps for deployment: - The instance should have access to further DLab installation - AMI - Ubuntu 16.04 - IAM role with [policy](#AWS_SSN_policy) should be assigned to the instance -- Put SSH key file created through Amazon Console on the instance +- Put SSH key file created through Amazon Console on the instance with the same name - Install Git and clone DLab repository #### In Azure cloud From 6fea71a083d99977cd228236d3399026f0ee42d7 Mon Sep 17 00:00:00 2001 From: Mykola Bodnar1 Date: Wed, 5 Jun 2019 16:46:37 +0300 Subject: [PATCH 150/357] README.md file updated --- README.md | 206 ------------------------------------------------------ 1 file changed, 206 deletions(-) diff --git a/README.md b/README.md index 13504ab53b..29e581443e 100644 --- a/README.md +++ b/README.md @@ -130,154 +130,7 @@ Creation of self-service node – is the first step for deploying DLab. SSN is a Elastic(Static) IP address is assigned to an SSN Node, so you are free to stop|start it and and SSN node's IP address won’t change. -<<<<<<< HEAD -<<<<<<< HEAD -## Edge node - -Setting up Edge node is the first step that user is asked to do once logged into DLab. This node is used as proxy server and SSH gateway for the user. Through Edge node users can access Notebook via HTTP and SSH. Edge Node has a Squid HTTP web proxy pre-installed. - -## Notebook node - -The next step is setting up a Notebook node (or a Notebook server). It is a server with pre-installed applications and libraries for data processing, data cleaning and transformations, numerical simulations, statistical modeling, machine learning, etc. Following analytical tools are currently supported in DLab and can be installed on a Notebook node: - -- Jupyter -- RStudio -- Apache Zeppelin -- TensorFlow + Jupyter -- Deep Learning + Jupyter - -Apache Spark is also installed for each of the analytical tools above. - -**Note:** terms 'Apache Zeppelin' and 'Apache Spark' hereinafter may be referred to as 'Zeppelin' and 'Spark' respectively or may have original reference. - -## Data engine cluster - -After deploying Notebook node, user can create one of the cluster for it: -- Data engine - Spark standalone cluster -- Data engine service - cloud managed cluster platform (EMR for AWS or Dataproc for GCP) -That simplifies running big data frameworks, such as Apache Hadoop and Apache Spark to process and analyze vast amounts of data. Adding cluster is not mandatory and is only needed in case additional computational resources are required for job execution. ----------------------- -# DLab Deployment - -## Prerequisites -#### In Amazon cloud -Prerequisites: - - - SSH key for EC2 instances. This key could be created through Amazon Console. - - IAM user - - AWS access key ID and secret access key - - The following permissions should be assigned for IAM user: - -``` -{ - "Version": "2012-10-17", - "Statement": [ - { - "Action": [ - "iam:ListRoles", - "iam:CreateRole", - "iam:CreateInstanceProfile", - "iam:PutRolePolicy", - "iam:AddRoleToInstanceProfile", - "iam:PassRole", - "iam:GetInstanceProfile", - "iam:ListInstanceProfilesForRole" - "iam:RemoveRoleFromInstanceProfile", - "iam:DeleteInstanceProfile", - "iam:TagRole" - ], - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": [ - "ec2:DescribeImages", - "ec2:CreateTags", - "ec2:DescribeRouteTables", - "ec2:CreateRouteTable", - "ec2:AssociateRouteTable", - "ec2:DescribeVpcEndpoints", - "ec2:CreateVpcEndpoint", - "ec2:ModifyVpcEndpoint", - "ec2:DescribeInstances", - "ec2:RunInstances", - "ec2:DescribeAddresses", - "ec2:AllocateAddress", - "ec2:DescribeInstances", - "ec2:AssociateAddress", - "ec2:DisassociateAddress", - "ec2:ReleaseAddress", - "ec2:TerminateInstances" - ], - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": [ - "s3:ListAllMyBuckets", - "s3:CreateBucket", - "s3:PutBucketTagging", - "s3:GetBucketTagging" - ], - "Effect": "Allow", - "Resource": "*" - } - ] -} -``` - -#### In Azure cloud - -Prerequisites: - -- IAM user with Contributor permissions. -- Service principal and JSON based auth file with clientId, clientSecret and tenantId. - -**Note:** The following permissions should be assigned to the service principal: - -- Windows Azure Active Directory -- Microsoft Graph -- Windows Azure Service Management API - -#### In Google cloud (GCP) - -Prerequisites: - -- IAM user -- Service account and JSON auth file for it. In order to get JSON auth file, Key should be created for service account through Google cloud console. -## Preparing environment for DLab deployment - -#### In Amazon cloud -If you want to deploy DLab from inside of your AWS account, you can use the following instruction: - -- Create an EC2 instance with the following settings: - - Shape of the instance shouldn't be less than t2.medium - - The instance should have access to Internet in order to install required prerequisites - - The instance should have access to further DLab installation - - AMI - Ubuntu 16.04 - - IAM role with [policy](#AWS_SSN_policy) should be assigned to the instance -- Connect to the instance via SSH and run the following commands: -``` - sudo su - apt-get update - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - apt-get update - apt-cache policy docker-ce - apt-get install -y docker-ce=17.06.2~ce-0~ubuntu - usermod -a -G docker ubuntu - apt-get install python-pip - pip install fabric==1.14.0 -``` -- Clone DLab repository and run deploy script. - -## Structure of main DLab directory -======= ### Structure of main DLab directory ->>>>>>> 84ff8aad0... README.md updated -======= -### Structure of main DLab directory ->>>>>>> 84ff8aad0... README.md updated DLab’s SSN node main directory structure is as follows: @@ -355,8 +208,6 @@ For each cloud provider, prerequisites are different. #### In Amazon cloud -<<<<<<< HEAD -======= Prerequisites: - SSH key for EC2 instances. This key could be created through Amazon Console. @@ -421,12 +272,6 @@ Prerequisites: } ``` -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> eb92433f3... README.md edited -======= -======= ->>>>>>> 84ff8aad0... README.md updated Preparation steps for deployment: - Create an EC2 instance with the following settings: @@ -468,10 +313,6 @@ Preparation steps for deployment: ### Executing deployment script -<<<<<<< HEAD ->>>>>>> 84ff8aad0... README.md updated -======= ->>>>>>> 84ff8aad0... README.md updated To build SSN node, following steps should be executed: - Connect to the instance via SSH and run the following commands: @@ -544,33 +385,6 @@ After SSN node deployment following AWS resources will be created: #### In Azure cloud -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -Prerequisites: - -- IAM user with Contributor permissions. -- Service principal and JSON based auth file with clientId, clientSecret and tenantId. - -**Note:** The following permissions should be assigned to the service principal: - -- Windows Azure Active Directory -- Microsoft Graph -- Windows Azure Service Management API - ->>>>>>> eb92433f3... README.md edited -To build SSN node, following steps should be executed: - -1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed -2. Go to *dlab* directory -3. To have working billing functionality please review Billing configuration note and use proper parameters for SSN node deployment -4. To use Data Lake Store please review Azure Data Lake usage pre-requisites note and use proper parameters for SSN node deployment -5. Execute following deploy_dlab.py script: -======= ->>>>>>> 84ff8aad0... README.md updated -======= ->>>>>>> 84ff8aad0... README.md updated ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --azure_region westus2 --conf_os_family debian --conf_cloud_provider azure --azure_vpc_name vpc-test --azure_subnet_name subnet-test --azure_security_group_name sg-test1,sg-test2 --key_path /root/ --conf_key_name Test --azure_auth_path /dir/file.json --action create ``` @@ -644,25 +458,6 @@ After SSN node deployment following Azure resources will be created: #### In Google cloud (GCP) -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -Prerequisites: - -- IAM user -- Service account and JSON auth file for it. In order to get JSON auth file, Key should be created for service account through Google cloud console. - ->>>>>>> eb92433f3... README.md edited -To build SSN node, following steps should be executed: - -1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. -2. Go to *dlab* directory. -3. Execute following script: -======= ->>>>>>> 84ff8aad0... README.md updated -======= ->>>>>>> 84ff8aad0... README.md updated ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xxx-xxxxx-x --conf_os_family debian --conf_cloud_provider gcp --key_path /path/to/key/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create ``` @@ -760,7 +555,6 @@ List of parameters for SSN node termination: | gcp\_project\_id | ID of GCP project | | action | In case of SSN node termination, this parameter should be set to “terminate” | - ## Edge Node Gateway node (or an Edge node) is an instance(virtual machine) provisioned in a public subnet. It serves as an entry point for accessing user’s personal analytical environment. It is created by an end-user, whose public key will be uploaded there. Only via Edge node, DLab user can access such application resources as notebook servers and dataengine clusters. Also, Edge Node is used to setup SOCKS proxy to access notebook servers via Web UI and SSH. Elastic(Static) IP address is assigned to an Edge Node. In case Edge node instance has been removed by mistake, there is an option to re-create it and Edge node IP address won’t change. From 1441b6a97108ccbe5acadb2f904c06114728f9eb Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 17:05:07 +0300 Subject: [PATCH 151/357] [DLAB-747]: cleanup status and keys check from resources list --- .../resources/resources-grid/resources-grid.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 05f8761663..68d7125f6e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -71,7 +71,7 @@
{{ env.status | underscoreless }} {{env.shape}} - + {{ env.cost || 'N/A' }} {{ env.currency_code || '' }} @@ -81,7 +81,7 @@ + [ngClass]="{ 'disabled': env.status.toLowerCase() === 'creating' }"> From 2ef726774b06302149240eeb21e83da29f972c11 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 17:06:14 +0300 Subject: [PATCH 152/357] [DLAB-747]: replace notebook validation with delimitersFiltering CheckUtils --- .../resources/resources-grid/resources-grid.component.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 6bf54027ff..4bb212d34b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -28,7 +28,7 @@ import { ResourcesGridRowModel } from './resources-grid.model'; import { FilterConfigurationModel } from './filter-configuration.model'; import { GeneralEnvironmentStatus } from '../../administration/management/management.model'; import { ConfirmationDialogType } from '../../shared'; -import { SortUtil } from '../../core/util'; +import { SortUtil, CheckUtils } from '../../core/util'; import { DetailDialogComponent } from '../exploratory/detail-dialog'; import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog'; import { InstallLibrariesComponent } from '../exploratory/install-libraries'; @@ -197,7 +197,6 @@ export class ResourcesGridComponent implements OnInit { } buildGrid(): void { - this.userResourceService.getUserProvisionedResources() .subscribe((result) => { this.environments = this.loadEnvironments(result.exploratory, result.shared); @@ -210,16 +209,12 @@ export class ResourcesGridComponent implements OnInit { containsNotebook(notebook_name: string): boolean { if (notebook_name) for (let index = 0; index < this.environments.length; index++) - if (this.delimitersFiltering(notebook_name) === this.delimitersFiltering(this.environments[index].name)) + if (CheckUtils.delimitersFiltering(notebook_name) === CheckUtils.delimitersFiltering(this.environments[index].name)) return true; return false; } - public delimitersFiltering(notebook_name): string { - return notebook_name.replace(this.delimitersRegex, '').toString().toLowerCase(); - } - loadEnvironments(exploratoryList: Array, sharedDataList: any): Array { if (exploratoryList && sharedDataList) { return exploratoryList.map((value) => { From cf2a00b3c0e53e744fc6afa7486ff6771f5a71a3 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 17:06:51 +0300 Subject: [PATCH 153/357] [DLAB-747]: cleanup status and keys check from management list page --- .../management-grid/management-grid.component.html | 11 ++++------- .../management-grid/management-grid.component.ts | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index 5d68686d34..1241f3ad91 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -57,12 +57,11 @@
pause_circle_outline + [ngClass]="{'not-allowed' : resource.status !== 'running' }">pause_circle_outline + [ngClass]="{ 'disabled' : element.status !== 'running' || resource.status !== 'running' && resource.status !== 'stopped' }"> highlight_off
@@ -76,11 +75,9 @@ 		+ || element.type === 'edge node' && element.user.toLowerCase() !== currentUser && element.status !== 'running' }">
  • ; @Input() environmentsHealthStatuses: Array; - @Input() healthStatus: string; @Input() resources: Array; - @Input() uploadKey: boolean; @Input() isAdmin: boolean; @Input() currentUser: string = ''; @Output() refreshGrid: EventEmitter<{}> = new EventEmitter(); From d892ae411ce161f5788402bf1db414f045745a63 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 17:07:17 +0300 Subject: [PATCH 154/357] [DLAB-747]: cleanup status and keys check from clusters list page --- .../computational-resources-list.component.html | 10 ++++------ .../computational-resources-list.component.ts | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html index 75f19fb9e0..d4cac2c46c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html @@ -34,21 +34,19 @@
    + || resource.status !== 'running' && resource.status !== 'stopped' }"> schedule pause_circle_outline + [ngClass]="{'not-allowed' : resource.status === 'stopping' }">pause_circle_outline play_circle_outline + [ngClass]="{'not-allowed' : resource.status === 'starting' }">play_circle_outline + && resource.status != 'running' && resource.status != 'failed' && resource.status != 'stopped' }" (click)="toggleResourceAction(resource, 'terminate')"> highlight_off
    diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts index 89e3992533..02ede9626b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts @@ -38,7 +38,6 @@ export class ComputationalResourcesListComponent { @Input() resources: any[]; @Input() environment: any[]; - @Input() healthStatus: string; @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); From 84fb5112f10e5eb4206dc29d857b5ec610cdc50a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 17:08:57 +0300 Subject: [PATCH 155/357] [DLAB-747]: separate backup data service --- .../backup-dilog/backup-dilog.component.ts | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts index 2257d3e1d7..feaf25fae4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts @@ -17,11 +17,13 @@ * under the License. */ -import { Component, OnInit, ViewChild, Output, Inject } from '@angular/core'; +import { Component, OnInit, Output, EventEmitter, Inject } from '@angular/core'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { ToastrService } from 'ngx-toastr'; import { BackupOptionsModel } from '../management.model'; +import { BackupService } from '../../../core/services'; @Component({ selector: 'dlab-backup-dilog', @@ -33,9 +35,14 @@ export class BackupDilogComponent implements OnInit { public backupOptions: BackupOptionsModel = new BackupOptionsModel([], [], [], [], false, false); public valid: boolean = true; + private clear = undefined; + @Output() preventbackup: EventEmitter<{}> = new EventEmitter(); + constructor( @Inject(MAT_DIALOG_DATA) public data: any, - public dialogRef: MatDialogRef + public dialogRef: MatDialogRef, + public toastr: ToastrService, + private backupService: BackupService, ) { } ngOnInit() { @@ -52,8 +59,13 @@ export class BackupDilogComponent implements OnInit { } public applyOptions(): void { - this.dialogRef.close(this.backupOptions); - this.backupOptions.setDegault(); + this.backupService.createBackup(this.backupOptions).subscribe(result => { + this.getBackupStatus(result); + this.toastr.success('Backup configuration is processing!', 'Processing!'); + this.clear = window.setInterval(() => this.getBackupStatus(result), 3000); + this.dialogRef.close(this.backupOptions); + }, + error => this.toastr.error(error.message, 'Oops!')); } private checkValidity(): void { @@ -69,4 +81,25 @@ export class BackupDilogComponent implements OnInit { this.valid = items.length > 0; } + + private getBackupStatus(result) { + debugger; + const uuid = result.body; + this.backupService.getBackupStatus(uuid) + .subscribe((backupStatus: any) => { + if (!this.creatingBackup) { + backupStatus.status === 'FAILED' + ? this.toastr.error('Backup configuration failed!', 'Oops!') + : this.toastr.success('Backup configuration completed!', 'Success!'); + clearInterval(this.clear); + } + }, () => { + clearInterval(this.clear); + this.toastr.error('Backup configuration failed!', 'Oops!'); + }); + } + + get creatingBackup(): boolean { + return this.backupService.inProgress; + } } From 58740b2606cf7f8aa2ddcad5a51f20b62ea86d60 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 17:11:02 +0300 Subject: [PATCH 156/357] [DLAB-747]: cleanup status and keys check from main navigation --- .../endpoints/endpoints.component.scss | 2 + .../management/management.component.html | 8 +- .../management/management.component.ts | 135 +++--------------- .../ssn-monitor/ssn-monitor.component.html | 1 + .../project-form/project-form.component.scss | 2 + .../src/app/reporting/reporting.component.ts | 2 - .../src/app/shared/navbar/navbar.component.ts | 45 +----- .../webapp/src/assets/styles/_theme.scss | 9 ++ .../src/main/resources/webapp/src/styles.scss | 2 - 9 files changed, 37 insertions(+), 169 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss index ed6e478ef8..fce53e140f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss @@ -32,6 +32,8 @@ position: absolute; right: 0; bottom: 5px; + font-family: 'Open Sans', sans-serif; + font-weight: 300; } } } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index e77144fbc1..16e9f5d392 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -38,9 +38,9 @@ - + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index 970b41ce6a..a891d85302 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -17,10 +17,9 @@ * under the License. */ -import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; -import { Subscription } from 'rxjs'; import { HealthStatusService, @@ -28,7 +27,6 @@ import { UserAccessKeyService, BackupService, UserResourceService, - RolesGroupsService, StorageService } from '../../core/services'; @@ -44,23 +42,13 @@ import { EndpointsComponent } from './endpoints/endpoints.component'; templateUrl: './management.component.html', styleUrls: ['./management.component.scss'] }) -export class ManagementComponent implements OnInit, OnDestroy { +export class ManagementComponent implements OnInit { public user: string = ''; public healthStatus: GeneralEnvironmentStatus; public allEnvironmentData: Array; - public uploadKey: boolean = true; public anyEnvInProgress: boolean = false; public notebookInProgress: boolean = false; - private subscriptions: Subscription = new Subscription(); - private clear = undefined; - - @ViewChild('backupDialog') backupDialog; - @ViewChild('manageEnvDialog') manageEnvironmentDialog; - @ViewChild('keyUploadModal') keyUploadDialog; - @ViewChild('ssnMonitor') ssnMonitorDialog; - // @ViewChild('rolesGroupsModal') rolesGroupsDialog; - constructor( public toastr: ToastrService, public dialog: MatDialog, @@ -69,23 +57,12 @@ export class ManagementComponent implements OnInit, OnDestroy { private manageEnvironmentsService: ManageEnvironmentsService, private userAccessKeyService: UserAccessKeyService, private userResourceService: UserResourceService, - private rolesService: RolesGroupsService, private storageService: StorageService ) { } ngOnInit() { this.buildGrid(); this.user = this.storageService.getUserName(); - this.subscriptions.add(this.userAccessKeyService.accessKeyEmitter - .subscribe(result => this.uploadKey = (result && result.status === 200))); - - this.subscriptions.add(this.userAccessKeyService.keyUploadProccessEmitter.subscribe(response => { - if (response) this.buildGrid(); - })); - } - - ngOnDestroy(): void { - this.subscriptions.unsubscribe(); } public buildGrid() { @@ -105,8 +82,7 @@ export class ManagementComponent implements OnInit, OnDestroy { } showBackupDialog() { - this.dialog.open(BackupDilogComponent, { panelClass: 'modal-sm' }) - .afterClosed().subscribe(result => result && this.createBackup(result)); + this.dialog.open(BackupDilogComponent, { panelClass: 'modal-sm' }); } showEndpointsDialog() { @@ -114,14 +90,6 @@ export class ManagementComponent implements OnInit, OnDestroy { .afterClosed().subscribe(result => result && this.buildGrid()); } - getActiveUsersList() { - return this.healthStatusService.getActiveUsers(); - } - - getTotalBudgetData() { - return this.healthStatusService.getTotalBudgetData(); - } - openManageEnvironmentDialog() { this.getActiveUsersList().subscribe(usersList => { this.getTotalBudgetData().subscribe( @@ -134,20 +102,9 @@ export class ManagementComponent implements OnInit, OnDestroy { } openSsnMonitorDialog() { - this.healthStatusService.getSsnMonitorData().subscribe( - data => this.dialog.open(SsnMonitorComponent, { data: data, panelClass: 'modal-lg' }), - () => this.toastr.error('Failed ssn data loading!', 'Oops!')); + this.dialog.open(SsnMonitorComponent, { panelClass: 'modal-lg' }); } - // openManageRolesDialog() { - // this.rolesService.getGroupsData().subscribe(group => { - // this.rolesService.getRolesData().subscribe( - // roles => this.rolesGroupsDialog.open({ isFooter: false }, group, roles), - // error => this.toastr.error(error.message, 'Oops!')); - // }, - // error => this.toastr.error(error.message, 'Oops!')); - // } - isEnvironmentsInProgress(data): boolean { return data.exploratory.some(el => { return el.status === 'creating' || el.status === 'starting' || @@ -159,47 +116,6 @@ export class ManagementComponent implements OnInit, OnDestroy { return data.exploratory.some(el => el.status === 'creating'); } - createBackup($event) { - this.backupService.createBackup($event).subscribe(result => { - this.getBackupStatus(result); - this.toastr.success('Backup configuration is processing!', 'Processing!'); - this.clear = window.setInterval(() => this.getBackupStatus(result), 3000); - }, - error => this.toastr.error(error.message, 'Oops!')); - } - - // manageRolesGroups($event) { - // switch ($event.action) { - // case 'create': - // this.rolesService.setupNewGroup($event.value).subscribe(res => { - // this.toastr.success('Group creation success!', 'Created!'); - // this.getGroupsData(); - // }, () => this.toastr.error('Group creation failed!', 'Oops!')); - // break; - // case 'update': - // this.rolesService.updateGroup($event.value).subscribe(res => { - // this.toastr.success('Group data successfully updated!', 'Success!'); - // this.getGroupsData(); - // }, () => this.toastr.error('Failed group data updating!', 'Oops!')); - // break; - // case 'delete': - // if ($event.type === 'users') { - // this.rolesService.removeUsersForGroup($event.value).subscribe(res => { - // this.toastr.success('Users was successfully deleted!', 'Success!'); - // this.getGroupsData(); - // }, () => this.toastr.error('Failed users deleting!', 'Oops!')); - // } else if ($event.type === 'group') { - // console.log('delete group'); - // this.rolesService.removeGroupById($event.value).subscribe(res => { - // this.toastr.success('Group was successfully deleted!', 'Success!'); - // this.getGroupsData(); - // }, () => this.toastr.error('Failed group deleting!', 'Oops!')); - // } - // break; - // default: - // } - // } - setBudgetLimits($event) { this.healthStatusService.updateUsersBudget($event.users).subscribe((result: any) => { this.healthStatusService.updateTotalBudgetData($event.total).subscribe((res: any) => { @@ -211,18 +127,11 @@ export class ManagementComponent implements OnInit, OnDestroy { }, error => this.toastr.error(error.message, 'Oops!')); } - // getGroupsData() { - // this.rolesService.getGroupsData().subscribe( - // list => this.rolesGroupsDialog.updateGroupData(list), - // error => this.toastr.error(error.message, 'Oops!')); - // } - manageEnvironment(event: { action: string, user: string }) { - this.healthStatusService - .manageEnvironment(event.action, event.user) + this.healthStatusService.manageEnvironment(event.action, event.user) .subscribe(res => { this.getActiveUsersList().subscribe(usersList => { - this.manageEnvironmentDialog.usersList = usersList; + // this.manageEnvironmentDialog.usersList = usersList; this.toastr.success(`Action ${event.action} is processing!`, 'Processing!'); this.buildGrid(); }); @@ -230,6 +139,10 @@ export class ManagementComponent implements OnInit, OnDestroy { error => this.toastr.error(error.message, 'Oops!')); } + get creatingBackup(): boolean { + return this.backupService.inProgress; + } + private getExploratoryList() { this.userResourceService.getUserProvisionedResources() .subscribe((result) => { @@ -238,26 +151,6 @@ export class ManagementComponent implements OnInit, OnDestroy { }); } - private getBackupStatus(result) { - const uuid = result.body; - this.backupService.getBackupStatus(uuid) - .subscribe((backupStatus: any) => { - if (!this.creatingBackup) { - backupStatus.status === 'FAILED' - ? this.toastr.error('Backup configuration failed!', 'Oops!') - : this.toastr.success('Backup configuration completed!', 'Success!'); - clearInterval(this.clear); - } - }, () => { - clearInterval(this.clear); - this.toastr.error('Backup configuration failed!', 'Oops!'); - }); - } - - get creatingBackup(): boolean { - return this.backupService.inProgress; - } - private getAllEnvironmentData() { this.manageEnvironmentsService .getAllEnvironmentData() @@ -287,4 +180,12 @@ export class ManagementComponent implements OnInit, OnDestroy { this.getExploratoryList(); }); } + + private getActiveUsersList() { + return this.healthStatusService.getActiveUsers(); + } + + private getTotalBudgetData() { + return this.healthStatusService.getTotalBudgetData(); + } } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html index 6f2097507b..30c818d45f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.html @@ -116,6 +116,7 @@

    SSN Monitor

    Monitor data are not available

    +     diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss index 4c241e941b..bbdf8cda0f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss @@ -37,5 +37,7 @@ position: absolute; right: 0; bottom: 2px; + font-family: 'Open Sans', sans-serif; + font-weight: 300; } } diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts index 2d34fe400c..aec9914dce 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts @@ -65,7 +65,6 @@ export class ReportingComponent implements OnInit, OnDestroy { reportData: ReportingConfigModel = ReportingConfigModel.getDefault(); filterConfiguration: ReportingConfigModel = ReportingConfigModel.getDefault(); data: any; - healthStatus: any; billingEnabled: boolean; admin: boolean; @@ -191,7 +190,6 @@ export class ReportingComponent implements OnInit, OnDestroy { private getEnvironmentHealthStatus() { this.healthStatusService.getEnvironmentHealthStatus() .subscribe((result: any) => { - this.healthStatus = result.status; this.billingEnabled = result.billingEnabled; this.admin = result.admin; diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index 4c333f8862..1b1c052e60 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -20,7 +20,6 @@ import { Component, ViewEncapsulation, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material'; import { Subscription, timer, interval } from 'rxjs'; -import { takeWhile } from 'rxjs/operators'; import { ToastrService } from 'ngx-toastr'; import { ApplicationSecurityService, @@ -31,9 +30,8 @@ import { ApplicationSecurityService, StorageService} from '../../core/services'; import { GeneralEnvironmentStatus } from '../../administration/management/management.model'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; -import { HTTP_STATUS_CODES, FileUtils } from '../../core/util'; +import { FileUtils } from '../../core/util'; import { NotificationDialogComponent } from '../modal-dialog/notification-dialog'; -import { ProgressDialogComponent } from '../modal-dialog/progress-dialog'; @Component({ selector: 'dlab-navbar', @@ -44,9 +42,6 @@ import { ProgressDialogComponent } from '../modal-dialog/progress-dialog'; export class NavbarComponent implements OnInit, OnDestroy { readonly PROVIDER = DICTIONARY.cloud_provider; - private alive: boolean = false; - private lastStatus: number | boolean = false; - private readonly CHECK_ACCESS_KEY_TIMEOUT: number = 30000; private readonly CHECK_ACTIVE_SCHEDULE_TIMEOUT: number = 55000; private readonly CHECK_ACTIVE_SCHEDULE_PERIOD: number = 15; @@ -74,7 +69,6 @@ export class NavbarComponent implements OnInit, OnDestroy { this.applicationSecurityService.loggedInStatus.subscribe(response => { this.subscriptions.unsubscribe(); this.subscriptions.closed = false; - this.alive = false; this.isLoggedIn = response; @@ -83,9 +77,6 @@ export class NavbarComponent implements OnInit, OnDestroy { this.healthStatus = result; result.status && this.checkQuoteUsed(this.healthStatus); })); - this.subscriptions.add(this.userAccessKeyService.accessKeyEmitter.subscribe(result => { - result && this.processAccessKeyStatus(result.status); - })); this.subscriptions.add(timer(0, this.CHECK_ACTIVE_SCHEDULE_TIMEOUT).subscribe(() => this.refreshSchedulerData())); this.currentUserName = this.getUserName(); this.checkVersionData(); @@ -95,7 +86,6 @@ export class NavbarComponent implements OnInit, OnDestroy { ngOnDestroy(): void { this.subscriptions.unsubscribe(); - this.alive = false; } getUserName(): string { @@ -138,10 +128,6 @@ export class NavbarComponent implements OnInit, OnDestroy { }); } - public checkCreationProgress($event): void { - this.userAccessKeyService.initialUserAccessKeyCheck(); - } - private checkQuoteUsed(params): void { if (!this.storage.getBillingQuoteUsed() && params) { let checkQuotaAlert = ''; @@ -156,35 +142,6 @@ export class NavbarComponent implements OnInit, OnDestroy { } } - private processAccessKeyStatus(status: number): void { - if (status === HTTP_STATUS_CODES.NOT_FOUND || status === HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) { - !this.dialog.openDialogs.length && this.dialog.closeAll(); - - // this.keyUploadDialog.open({ isFooter: false }); - this.alive = false; - this.lastStatus = status; - } else if (status === HTTP_STATUS_CODES.ACCEPTED) { - !this.dialog.openDialogs.length && this.dialog.open(ProgressDialogComponent, {panelClass: 'modal-xs'}); - - if (!this.alive) { - this.alive = true; - this.subscriptions.add( - interval(this.CHECK_ACCESS_KEY_TIMEOUT) - .pipe(takeWhile(() => this.alive)) - .subscribe(() => this.userAccessKeyService.initialUserAccessKeyCheck())); - } - this.lastStatus = status; - } else if (status === HTTP_STATUS_CODES.OK) { - if (this.lastStatus) { - this.userAccessKeyService.emitActionOnKeyUploadComplete(); - this.lastStatus = false; - } - this.alive = false; - this.dialog.closeAll(); - // this.keyUploadDialog.close(); - } - } - private refreshSchedulerData(): void { this.schedulerService.getActiveSchcedulersData(this.CHECK_ACTIVE_SCHEDULE_PERIOD).subscribe((list: Array) => { if (list.length) { diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 301f6aed96..61d3ab5b1e 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -512,4 +512,13 @@ mat-tab-group.mat-tab-group { } mat-divider.mat-divider { margin: 10px 0; +} + +mat-progress-bar { + .mat-progress-bar-fill::after { + background-color: #00BCD4; + } + .mat-progress-bar-buffer { + background-color: #baf0f7; + } } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 1136d98584..c765793d44 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -126,8 +126,6 @@ mat-chip.mat-chip strong { .error { color: #f1696e; font-size: 12px; - font-family: 'Open Sans', sans-serif; - font-weight: 300; } .not-allowed { cursor: not-allowed !important; From 9125adf31d7c719ab7496c0882a2ddbf92893c3e Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 17:45:00 +0300 Subject: [PATCH 157/357] [DLAB-747]: update data after stop/terminate resources --- .../management-grid.component.ts | 53 +++++++------------ 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts index 1173e8361a..bc865b5863 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts @@ -23,8 +23,7 @@ import { ToastrService } from 'ngx-toastr'; import { HealthStatusService, UserAccessKeyService } from '../../../core/services'; import { ConfirmationDialogType } from '../../../shared'; -import { FileUtils } from '../../../core/util'; -import { ConfirmationDialogComponent } from '../../../shared/modal-dialog/confirmation-dialog/confirmation-dialog.component'; +import { ConfirmationDialogComponent } from '../../../shared/modal-dialog/confirmation-dialog'; export interface ManageAction { action: string; @@ -55,10 +54,9 @@ export class ManagementGridComponent implements OnInit { constructor( private healthStatusService: HealthStatusService, - private userAccessKeyService: UserAccessKeyService, public toastr: ToastrService, public dialog: MatDialog - ) {} + ) { } ngOnInit() { } @@ -70,41 +68,35 @@ export class ManagementGridComponent implements OnInit { toggleResourceAction(environment, action: string, resource?) { if (resource) { const resource_name = resource ? resource.computational_name : environment.name; - const dialogRef: MatDialogRef = this.dialog.open(ReconfirmationDialogComponent, { + this.dialog.open(ReconfirmationDialogComponent, { data: { action, resource_name, user: environment.user }, - width: '550px', - panelClass: 'error-modalbox' - }); - dialogRef.afterClosed().subscribe(result => { + width: '550px', panelClass: 'error-modalbox' + }).afterClosed().subscribe(result => { result && this.actionToggle.emit({ action, environment, resource }); }); } else { const type = (environment.name === 'edge node' || environment.type.toLowerCase() === 'edge node') - ? ConfirmationDialogType.StopEdgeNode : ConfirmationDialogType.StopExploratory; + ? ConfirmationDialogType.StopEdgeNode : ConfirmationDialogType.StopExploratory; if (action === 'stop') { this.dialog.open(ConfirmationDialogComponent, { data: { notebook: environment, type: type, manageAction: this.isAdmin }, panelClass: 'modal-md' - }); + }).afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'terminate') { this.dialog.open(ConfirmationDialogComponent, { data: { notebook: environment, type: ConfirmationDialogType.TerminateExploratory, manageAction: this.isAdmin } - }); + }).afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'run') { - this.healthStatusService - .runEdgeNode() - .subscribe(() => { - this.buildGrid(); - this.toastr.success('Edge node is starting!', 'Processing!'); - }, error => this.toastr.error('Edge Node running failed!', 'Oops!')); - } else if (action === 'recreate') { - this.healthStatusService - .recreateEdgeNode() - .subscribe(() => { - this.buildGrid(); - this.toastr.success('Edge Node recreation is processing!', 'Processing!'); - }, error => this.toastr.error('Edge Node recreation failed!', 'Oops!')); - } + this.healthStatusService.runEdgeNode().subscribe(() => { + this.buildGrid(); + this.toastr.success('Edge node is starting!', 'Processing!'); + }, () => this.toastr.error('Edge Node running failed!', 'Oops!')); + } else if (action === 'recreate') { + this.healthStatusService.recreateEdgeNode().subscribe(() => { + this.buildGrid(); + this.toastr.success('Edge Node recreation is processing!', 'Processing!'); + }, () => this.toastr.error('Edge Node recreation failed!', 'Oops!')); + } } } @@ -132,13 +124,6 @@ export class ManagementGridComponent implements OnInit { showReuploaKeydDialog() { this.keyReuploadDialog.open({ isFooter: false }); } - - public generateUserKey() { - this.userAccessKeyService.regenerateAccessKey().subscribe(data => { - FileUtils.downloadFile(data); - this.buildGrid(); - }); - } } @@ -168,5 +153,5 @@ export class ReconfirmationDialogComponent { constructor( public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any - ) {} + ) { } } From 6a4689e40bc45787fef6ea1bc276c025e5969702 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 17:46:53 +0300 Subject: [PATCH 158/357] [DLAB-747]: cleanup key generation --- .../src/app/administration/roles/roles.component.scss | 3 +-- .../src/app/shared/navbar/navbar.component.html | 5 ----- .../webapp/src/app/shared/navbar/navbar.component.ts | 11 ----------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss index eb33091dd7..aee43a38ef 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss @@ -113,7 +113,6 @@ } .roles { width: 30%; - padding: 0 10px; .selector-wrapper-edit { position: relative; display: flex; @@ -307,7 +306,7 @@ table { cursor: pointer; .mat-icon { font-size: 18px; - padding-top: 5px; + padding-top: 12px; } &:hover { color: darken(#607d8b, 10%); diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index bb3c059640..a123015aad 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -112,11 +112,6 @@ - - - - diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index 1b1c052e60..7da5ad9606 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -117,17 +117,6 @@ export class NavbarComponent implements OnInit, OnDestroy { }); } - public generateUserKey($event): void { - console.log('generate key', $event); - this.userAccessKeyService.generateAccessKey().subscribe( - data => { - FileUtils.downloadFile(data); - this.userAccessKeyService.initialUserAccessKeyCheck(); - }, error => { - this.toastr.error(error.message || 'Access key generation failed!', 'Oops!'); - }); - } - private checkQuoteUsed(params): void { if (!this.storage.getBillingQuoteUsed() && params) { let checkQuotaAlert = ''; From 4ded100aa0dd1e1f3982f6af819e804c8814c03f Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 5 Jun 2019 18:15:02 +0300 Subject: [PATCH 159/357] [DLAB-747]: moved and extended resources grid model --- .../resources-grid/create-resource.model.ts | 25 ---------- .../resources-grid.component.ts | 50 ++++--------------- .../resources-grid/resources-grid.model.ts | 42 +++++++++++++++- .../src/app/resources/resources.component.ts | 4 +- 4 files changed, 51 insertions(+), 70 deletions(-) delete mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/create-resource.model.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/create-resource.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/create-resource.model.ts deleted file mode 100644 index 9209b095f9..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/create-resource.model.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export class CreateResourceModel { - constructor( - public name: string, - public count: string - ) { } -} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 4bb212d34b..fc2eaf09ca 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -23,8 +23,8 @@ import { ToastrService } from 'ngx-toastr'; import { MatDialog } from '@angular/material'; import { UserResourceService } from '../../core/services'; -import { CreateResourceModel } from './create-resource.model'; -import { ResourcesGridRowModel } from './resources-grid.model'; + +import { ExploratoryModel } from './resources-grid.model'; import { FilterConfigurationModel } from './filter-configuration.model'; import { GeneralEnvironmentStatus } from '../../administration/management/management.model'; import { ConfirmationDialogType } from '../../shared'; @@ -48,17 +48,16 @@ import { DICTIONARY } from '../../../dictionary/global.dictionary'; export class ResourcesGridComponent implements OnInit { readonly DICTIONARY = DICTIONARY; - environments: Array; - filteredEnvironments: Array = []; + environments: Array; + filteredEnvironments: Array = []; filterConfiguration: FilterConfigurationModel; filterForm: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); - model = new CreateResourceModel('', ''); + isOutscreenDropdown: boolean; collapseFilterRow: boolean = false; filtering: boolean = false; activeFiltering: boolean = false; healthStatus: GeneralEnvironmentStatus; - delimitersRegex = /[-_]?/g; public filteringColumns: Array = [ { title: 'Environment name', name: 'name', className: 'th_name', filtering: {} }, @@ -84,7 +83,7 @@ export class ResourcesGridComponent implements OnInit { } getDefaultFilterConfiguration(): void { - const data: Array = this.environments; + const data: Array = this.environments; const shapes = [], statuses = [], resources = []; data.forEach((item: any) => { @@ -107,8 +106,8 @@ export class ResourcesGridComponent implements OnInit { applyFilter_btnClick(config: FilterConfigurationModel) { this.filtering = true; - // let filteredData: Array = this.environments.map(env => (Object).assign({}, env)); - let filteredData: Array = this.environments.map(env => (Object).create(env)); + // let filteredData: Array = this.environments.map(env => (Object).assign({}, env)); + let filteredData: Array = this.environments.map(env => (Object).create(env)); const containsStatus = (list, selectedItems) => { return list.filter((item: any) => { if (selectedItems.indexOf(item.status) !== -1) return item; }); }; @@ -199,7 +198,7 @@ export class ResourcesGridComponent implements OnInit { buildGrid(): void { this.userResourceService.getUserProvisionedResources() .subscribe((result) => { - this.environments = this.loadEnvironments(result.exploratory, result.shared); + this.environments = ExploratoryModel.loadEnvironments(result.exploratory, result.shared); this.getDefaultFilterConfiguration(); (this.environments.length) ? this.getUserPreferences() : this.filteredEnvironments = []; @@ -215,37 +214,6 @@ export class ResourcesGridComponent implements OnInit { return false; } - loadEnvironments(exploratoryList: Array, sharedDataList: any): Array { - if (exploratoryList && sharedDataList) { - return exploratoryList.map((value) => { - return new ResourcesGridRowModel(value.exploratory_name, - value.template_name, - value.image, - value.status, - value.shape, - value.computational_resources, - value.up_time, - value.exploratory_url, - sharedDataList.edge_node_ip, - value.exploratory_user, - value.exploratory_pass, - sharedDataList[DICTIONARY.bucket_name], - sharedDataList[DICTIONARY.shared_bucket_name], - value.error_message, - value[DICTIONARY.billing.cost], - value[DICTIONARY.billing.currencyCode], - value.billing, - value.libs, - sharedDataList[DICTIONARY.user_storage_account_name], - sharedDataList[DICTIONARY.shared_storage_account_name], - sharedDataList[DICTIONARY.datalake_name], - sharedDataList[DICTIONARY.datalake_user_directory_name], - sharedDataList[DICTIONARY.datalake_shared_directory_name], - ); - }); - } - } - getUserPreferences(): void { this.userResourceService.getUserPreferences() .subscribe((result: FilterConfigurationModel) => { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts index edd2af6d4d..93d3d0a716 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts @@ -16,8 +16,11 @@ * specific language governing permissions and limitations * under the License. */ +import { DICTIONARY } from '../../../dictionary/global.dictionary'; + +export class ExploratoryModel { + readonly DICTIONARY = DICTIONARY; -export class ResourcesGridRowModel { constructor( public name: Array, public template_name: string, @@ -41,6 +44,41 @@ export class ResourcesGridRowModel { public shared_account_name: string, public datalake_name: string, public datalake_directory: string, - public datalake_shared_directory: string + public datalake_shared_directory: string, + public project: string, + public endpoint: string, ) { } + + public static loadEnvironments(exploratoryList: Array, sharedDataList: any): Array { + if (exploratoryList && sharedDataList) { + return exploratoryList.map((value) => { + return new ExploratoryModel(value.exploratory_name, + value.template_name, + value.image, + value.status, + value.shape, + value.computational_resources, + value.up_time, + value.exploratory_url, + sharedDataList.edge_node_ip, + value.exploratory_user, + value.exploratory_pass, + sharedDataList[DICTIONARY.bucket_name], + sharedDataList[DICTIONARY.shared_bucket_name], + value.error_message, + value[DICTIONARY.billing.cost], + value[DICTIONARY.billing.currencyCode], + value.billing, + value.libs, + sharedDataList[DICTIONARY.user_storage_account_name], + sharedDataList[DICTIONARY.shared_storage_account_name], + sharedDataList[DICTIONARY.datalake_name], + sharedDataList[DICTIONARY.datalake_user_directory_name], + sharedDataList[DICTIONARY.datalake_shared_directory_name], + value.project, + value.endpoint + ); + }); + } + } } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts index f6725cf68e..d59e4a0ee4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts @@ -24,7 +24,7 @@ import { MatDialog } from '@angular/material'; import { ResourcesGridComponent } from './resources-grid/resources-grid.component'; import { ExploratoryEnvironmentCreateComponent } from './exploratory/create-environment'; -import { ResourcesGridRowModel } from './resources-grid/resources-grid.model'; +import { ExploratoryModel } from './resources-grid/resources-grid.model'; import { HealthStatusService } from '../core/services'; import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; @@ -35,7 +35,7 @@ import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; }) export class ResourcesComponent implements OnInit { - public exploratoryEnvironments: Array = []; + public exploratoryEnvironments: Array = []; public healthStatus: any; @ViewChild(ResourcesGridComponent) resourcesGrid: ResourcesGridComponent; From ac68ebf17de253929f3bc2b973b3baf7f26e0620 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 6 Jun 2019 16:59:52 +0300 Subject: [PATCH 160/357] [DLAB-649]: toolbar markup fixes --- .../webapp/src/app/reporting/toolbar/toolbar.component.css | 1 - .../webapp/src/app/reporting/toolbar/toolbar.component.html | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.css b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.css index d520b8a8c6..5e82739cb6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.css +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.css @@ -20,7 +20,6 @@ section { display: flex; justify-content: space-between; - padding: 10px 15px; font-weight: 300; } section > div { diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html index c7f16d5c13..e4253384d5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html @@ -22,7 +22,8 @@
    Service base name: {{ reportData.service_base_name }}
    Resource tag ID: {{ reportData.tag_resource_id }}
    - Available reporting period from: {{ availablePeriodFrom | date }} + Available reporting period from: + {{ availablePeriodFrom | date }} to: {{ availablePeriodTo | date }}
    From 56b116d20896367e35888ee7ef882d7dc20f3573 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 6 Jun 2019 17:02:35 +0300 Subject: [PATCH 161/357] [DLAB-649]: billing data sctructure fixed --- .../src/app/reporting/reporting.component.ts | 28 +++++++++---------- .../webapp/src/assets/styles/_theme.scss | 9 +++++- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts index aec9914dce..bbf7010545 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts @@ -31,14 +31,14 @@ import { DICTIONARY, ReportingConfigModel } from '../../dictionary/global.dictio @Component({ selector: 'dlab-reporting', template: ` - - - -
    - Total {{ data[DICTIONARY.billing.costTotal] }} {{ data[DICTIONARY.billing.currencyCode] }} -
    +
    + + + + +
    `, styles: [` @@ -88,7 +88,7 @@ export class ReportingComponent implements OnInit, OnDestroy { this.billingReportService.getGeneralBillingData(this.reportData) .subscribe(data => { this.data = data; - this.reportingGrid.reportData = this.data.lines; + this.reportingGrid.reportData = this.data; this.reportingGrid.full_report = this.data.full_report; this.reportingToolbar.reportData = this.data; @@ -176,17 +176,17 @@ export class ReportingComponent implements OnInit, OnDestroy { this.reportingToolbar.clearRangePicker(); } - clearStorage(): void { - localStorage.removeItem('report_config'); - localStorage.removeItem('report_period'); - } - setRangeOption(dateRangeOption: any): void { this.reportData.date_start = dateRangeOption.start_date; this.reportData.date_end = dateRangeOption.end_date; this.getGeneralBillingData(); } + private clearStorage(): void { + localStorage.removeItem('report_config'); + localStorage.removeItem('report_period'); + } + private getEnvironmentHealthStatus() { this.healthStatusService.getEnvironmentHealthStatus() .subscribe((result: any) => { diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 61d3ab5b1e..7ddacce566 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -502,6 +502,13 @@ mat-horizontal-stepper { vertical-align: top; padding: 10px 5px; } + tr.mat-footer-row { + font-weight: bold; + } + + // .mat-table-sticky { + // border-top: 1px solid #e0e0e0; + // } } mat-tab-group.mat-tab-group { @@ -521,4 +528,4 @@ mat-progress-bar { .mat-progress-bar-buffer { background-color: #baf0f7; } -} \ No newline at end of file +} From 48500741e91f1258be680e6670ae81b66da03820 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 6 Jun 2019 17:03:30 +0300 Subject: [PATCH 162/357] [DLAB-649]: extend billing data grid; sticky elementing --- .../webapp/src/app/core/util/patterns.ts | 2 +- .../reporting-grid.component.html | 169 ++++++++++++++++-- .../reporting-grid.component.scss | 14 +- .../reporting-grid.component.ts | 4 +- 4 files changed, 170 insertions(+), 19 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts index c82bb554d2..65996ea148 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts @@ -20,5 +20,5 @@ export const PATTERNS = { namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+', delimitersRegex: '/[-_]?/g', - url: '[-_a-zA-Z0-9/:.#]*[_-]*[a-zA-Z0-9]+' + url: '[-_a-zA-Z0-9/:.#!*();:@&=+$,/?#[]]*[_-]*[a-zA-Z0-9]+' } diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html index b468f1efa9..7b7336f409 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html @@ -17,15 +17,16 @@ ~ under the License. --> - + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Environment name {{element[DICTIONARY.billing.dlabId]}} Total User {{element.user}} Resource Type {{element[DICTIONARY.billing.resourceType]}} Status + {{ element.status.toLowerCase() }} + N/A + {{ DICTIONARY.instance_size}} + + {{ DICTIONARY.service}} + {{ element[DICTIONARY.billing.service] }} + ({{ element.resource_type }}) + Service Charges + {{ element[DICTIONARY.billing.cost] }} {{ element[DICTIONARY.billing.currencyCode] }} + {{ reportData[DICTIONARY.billing.costTotal] }} + {{ reportData[DICTIONARY.billing.currencyCode] }} + + + + + + + + + + + + + +
    + + + +
    +
    + + \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss index ed7a79fd6a..1c2ced0f74 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss @@ -17,7 +17,14 @@ * under the License. */ -.dashboard_table.reporting { + .table-wrapper { + width: 100%; + } + +.reporting { + width: 100%; + min-width: 1100px; + overflow: auto; tr { th { font-size: 11px; @@ -26,6 +33,9 @@ font-size: 13px; } &.filter-row { + th { + padding: 5px; + } .filter-field { font-size: 13px; } @@ -45,7 +55,7 @@ .th_type { width: 8%; } - .th_rstatus { + .th_status { width: 8%; } .th_charges { diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts index f4294a6e28..0aed840aef 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts @@ -33,12 +33,14 @@ export class ReportingGridComponent implements OnInit { filterConfiguration: ReportingConfigModel; filteredReportData: ReportingConfigModel = new ReportingConfigModel([], [], [], [], [], '', '', ''); collapseFilterRow: boolean = false; - reportData: ReportingConfigModel[]; + reportData: any; isFiltered: boolean = false; full_report: boolean = false; @Output() filterReport: EventEmitter<{}> = new EventEmitter(); @Output() resetRangePicker: EventEmitter = new EventEmitter(); + displayedColumns: string[] = ['name', 'user', 'type', 'status', 'shape', 'service', 'charge']; + displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions']; public filteringColumns: Array = [ { title: 'User', name: 'user', className: 'th_user', filtering: true, role: 'admin'}, From 8aa0bac2d098c8829defa87670466d3e097fa2cc Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 6 Jun 2019 18:21:53 +0300 Subject: [PATCH 163/357] [DLAB-649]: extend billing data grid --- .../reporting-grid.component.html | 28 ++++++++----------- .../reporting-grid.component.ts | 8 +++++- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html index 7b7336f409..968d14884f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html @@ -92,8 +92,8 @@
--> -
- +
+
@@ -146,8 +146,9 @@ - + @@ -159,8 +160,8 @@ @@ -178,14 +179,15 @@ @@ -212,14 +214,8 @@
Environment name {{ element[DICTIONARY.billing.cost] }} {{ element[DICTIONARY.billing.currencyCode] }} {{ reportData[DICTIONARY.billing.costTotal] }} - {{ reportData[DICTIONARY.billing.currencyCode] }} + {{ reportData[DICTIONARY.billing.costTotal] }} {{ reportData[DICTIONARY.billing.currencyCode] }} + - + - -
- + +
+ +
+ + Select project + + {{ template.template_name }} + Templates list is empty + + + +
-
+
-
+
Add computational resources
+
-
- +
+
@@ -72,15 +87,15 @@

Add computational resources

-
- +
+
-
- +
+
@@ -88,7 +103,7 @@

Add computational resources

-
+
-
To view example JSON of configurations refer for AWS official documentation
@@ -152,12 +167,15 @@

Add computational resources

-
-
Computational resource creations are not available.
Please, check your permissions.
+ +
Computational resource creations are not available.
Please, check your permissions.
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts index f6b133447b..727e44b8ed 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts @@ -41,10 +41,13 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { readonly CLUSTER_CONFIGURATION = CLUSTER_CONFIGURATION; readonly CheckUtils = CheckUtils; - model: ComputationalResourceCreateModel; + // model: ComputationalResourceCreateModel; notebook_instance: any; full_list: any; - template_description: string; + + templates = []; + selectedImage: any; + shapes: any; spotInstance: boolean = true; clusterNamePattern: string = '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+'; @@ -60,7 +63,6 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { public maxSpotPrice: number = 0; public resourceForm: FormGroup; - // @ViewChild('bindDialog') bindDialog; @ViewChild('name') name; @ViewChild('clusterType') cluster_type; @ViewChild('templatesList') templates_list; @@ -80,62 +82,60 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { private ref: ChangeDetectorRef, public dialogRef: MatDialogRef, ) { - this.model = ComputationalResourceCreateModel.getDefault(userResourceService); + // this.model = ComputationalResourceCreateModel.getDefault(userResourceService); } ngOnInit() { this.initFormModel(); - // this.bindDialog.onClosing = () => this.resetDialog(); this.open(this.data.notebook, this.data.full_list); } - // public isNumberKey($event): boolean { - // const charCode = ($event.which) ? $event.which : $event.keyCode; - // if (charCode !== 46 && charCode > 31 && (charCode < 48 || charCode > 57)) { - // $event.preventDefault(); - // return false; - // } - // return true; - // } - public onUpdate($event): void { - if ($event.model.type === 'template') { - this.model.setSelectedTemplate($event.model.index); - this.master_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, - this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'master_shape', 'description', 'json'); - this.slave_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, - this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'slave_shape', 'description', 'json'); - this.shapes.master_shape = this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type'); - this.shapes.slave_shape = this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type'); - } - if ($event.model.type === 'cluster_type') { - this.model.setSelectedClusterType($event.model.index); - this.setDefaultParams(); - this.getComputationalResourceLimits(); - this.selectConfiguration(); - } - if (this.shapes[$event.model.type]) - this.shapes[$event.model.type] = $event.model.value.type; - if (DICTIONARY.cloud_provider === 'aws') - if ($event.model.type === 'slave_shape' && this.spotInstancesSelect.nativeElement['checked']) { - this.spotInstance = $event.model.value.spot; - } - } - public createComputationalResource($event, data, shape_master: string, shape_slave: string) { - this.model.setCreatingParams( - data.cluster_alias_name, - data.instance_number, - shape_master, shape_slave, - this.spotInstance, - data.instance_price, - data.preemptible_instance_number, - data.configuration_parameters ? JSON.parse(data.configuration_parameters) : null); - this.model.confirmAction(); - $event.preventDefault(); + // public onUpdate($event): void { + // if ($event.model.type === 'template') { + // this.model.setSelectedTemplate($event.model.index); + // this.master_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, + // this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'master_shape', 'description', 'json'); + // this.slave_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, + // this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'slave_shape', 'description', 'json'); + + // this.shapes.master_shape = this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type'); + // this.shapes.slave_shape = this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type'); + // } + // if ($event.model.type === 'cluster_type') { + // this.model.setSelectedClusterType($event.model.index); + // this.setDefaultParams(); + // this.getComputationalResourceLimits(); + // this.selectConfiguration(); + // } + + // if (this.shapes[$event.model.type]) + // this.shapes[$event.model.type] = $event.model.value.type; + + // if (DICTIONARY.cloud_provider === 'aws') + // if ($event.model.type === 'slave_shape' && this.spotInstancesSelect.nativeElement['checked']) { + // this.spotInstance = $event.model.value.spot; + // } + // } + + public createComputationalResource(data, shape_master: string, shape_slave: string) { + // this.model.setCreatingParams( + // data.cluster_alias_name, + // data.instance_number, + // shape_master, shape_slave, + // this.spotInstance, + // data.instance_price, + // data.preemptible_instance_number, + // data.configuration_parameters ? JSON.parse(data.configuration_parameters) : null); + // this.model.confirmAction(); + // $event.preventDefault(); + + console.log(data); + return false; } @@ -168,9 +168,9 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { this.spotInstance = this.shapePlaceholder(filtered, 'spot'); this.resourceForm.controls['instance_price'].setValue(50); } else { - this.slave_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, - this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'slave_shape', 'description', 'json'); - this.shapes.slave_shape = this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type'); + // this.slave_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, + // this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'slave_shape', 'description', 'json'); + // this.shapes.slave_shape = this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type'); this.spotInstance = false; this.resourceForm.controls['instance_price'].setValue(0); @@ -184,7 +184,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { public selectConfiguration() { if (this.configuration && this.configuration.nativeElement.checked) { - const template = (this.model.selectedImage.image === 'docker.dlab-dataengine-service') + const template = (this.selectedImage.image === 'docker.dlab-dataengine-service') ? CLUSTER_CONFIGURATION.EMR : CLUSTER_CONFIGURATION.SPARK; this.resourceForm.controls['configuration_parameters'].setValue(JSON.stringify(template, undefined, 2)); @@ -214,25 +214,26 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { public open(notebook_instance, full_list): void { this.notebook_instance = notebook_instance; this.full_list = full_list; - this.model = new ComputationalResourceCreateModel('', 0, '', '', notebook_instance.name, - response => { - if (response.status === HTTP_STATUS_CODES.OK) { - this.dialogRef.close(); - this.buildGrid.emit(); - } - }, - error => this.toastr.error(error.message || 'Computational resource creation failed!', 'Oops!'), - () => this.template_description = this.model.selectedItem.description, - () => { - // this.bindDialog.modalClass += !this.model.availableTemplates ? 'reset' : ''; - // this.dialogRef.updateSize('40%', '80%'); - - this.ref.detectChanges(); - - this.setDefaultParams(); + this.getTemplates(this.notebook_instance.project); + // this.model = new ComputationalResourceCreateModel('', 0, '', '', notebook_instance.name, + // response => { + // if (response.status === HTTP_STATUS_CODES.OK) { + // this.dialogRef.close(); + // this.buildGrid.emit(); + // } + // }, + // error => this.toastr.error(error.message || 'Computational resource creation failed!', 'Oops!'), + // () => {}, + // () => { + // // this.bindDialog.modalClass += !this.model.availableTemplates ? 'reset' : ''; + // // this.dialogRef.updateSize('40%', '80%'); + + // this.ref.detectChanges(); + + // this.setDefaultParams(); this.getComputationalResourceLimits(); - }, - this.userResourceService); + // }, + // this.userResourceService); } public preemptibleCounter($event, action): void { @@ -245,6 +246,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { private initFormModel(): void { this.resourceForm = this._fb.group({ + template_name: ['', [Validators.required]], cluster_alias_name: ['', [Validators.required, Validators.pattern(this.clusterNamePattern), this.providerMaxLength, this.checkDuplication.bind(this)]], instance_number: ['', [Validators.required, Validators.pattern(this.nodeCountPattern), this.validInstanceNumberRange.bind(this)]], @@ -259,20 +261,20 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { } private getComputationalResourceLimits(): void { - if (this.model.availableTemplates && this.model.selectedImage && this.model.selectedImage.image) { - const activeImage = DICTIONARY[this.model.selectedImage.image]; + if (this.templates.length && this.selectedImage && this.selectedImage.image) { + const activeImage = DICTIONARY[this.selectedImage.image]; - this.minInstanceNumber = this.model.selectedImage.limits[activeImage.total_instance_number_min]; - this.maxInstanceNumber = this.model.selectedImage.limits[activeImage.total_instance_number_max]; + this.minInstanceNumber = this.selectedImage.limits[activeImage.total_instance_number_min]; + this.maxInstanceNumber = this.selectedImage.limits[activeImage.total_instance_number_max]; - if (DICTIONARY.cloud_provider === 'gcp' && this.model.selectedImage.image === 'docker.dlab-dataengine-service') { - this.maxInstanceNumber = this.model.selectedImage.limits[activeImage.total_instance_number_max] - 1; - this.minPreemptibleInstanceNumber = this.model.selectedImage.limits.min_dataproc_preemptible_instance_count; + if (DICTIONARY.cloud_provider === 'gcp' && this.selectedImage.image === 'docker.dlab-dataengine-service') { + this.maxInstanceNumber = this.selectedImage.limits[activeImage.total_instance_number_max] - 1; + this.minPreemptibleInstanceNumber = this.selectedImage.limits.min_dataproc_preemptible_instance_count; } - if (DICTIONARY.cloud_provider === 'aws' && this.model.selectedImage.image === 'docker.dlab-dataengine-service') { - this.minSpotPrice = this.model.selectedImage.limits.min_emr_spot_instance_bid_pct; - this.maxSpotPrice = this.model.selectedImage.limits.max_emr_spot_instance_bid_pct; + if (DICTIONARY.cloud_provider === 'aws' && this.selectedImage.image === 'docker.dlab-dataengine-service') { + this.minSpotPrice = this.selectedImage.limits.min_emr_spot_instance_bid_pct; + this.maxSpotPrice = this.selectedImage.limits.max_emr_spot_instance_bid_pct; this.spotInstancesSelect.nativeElement['checked'] = true; this.selectSpotInstances(); @@ -285,7 +287,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { private validInstanceNumberRange(control) { if (control && control.value) - if (DICTIONARY.cloud_provider === 'gcp' && this.model.selectedImage.image === 'docker.dlab-dataengine-service') { + if (DICTIONARY.cloud_provider === 'gcp' && this.selectedImage.image === 'docker.dlab-dataengine-service') { this.validPreemptibleNumberRange(); return control.value >= this.minInstanceNumber && control.value <= this.maxInstanceNumber ? null : { valid: false }; } else { @@ -339,56 +341,59 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { } private setDefaultParams(): void { - if (this.model.selectedImage && this.model.selectedImage.shapes) { - this.filterShapes(); - this.shapes = { - master_shape: this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type'), - slave_shape: this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type') - }; - if (DICTIONARY.cloud_provider !== 'azure' && this.cluster_type) { - this.cluster_type.setDefaultOptions(this.model.resourceImages, - this.model.selectedImage.template_name, 'cluster_type', 'template_name', 'array'); - if (this.model.selectedImage.image === 'docker.dlab-dataengine-service') - this.templates_list.setDefaultOptions(this.model.templates, - this.model.selectedItem.version, 'template', 'version', 'array'); - } - this.master_shapes_list && this.master_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, - this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'master_shape', 'description', 'json'); - this.slave_shapes_list && this.slave_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, - this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'slave_shape', 'description', 'json'); - } + // if (this.model.selectedImage && this.model.selectedImage.shapes) { + // this.filterShapes(); + // this.shapes = { + // master_shape: this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type'), + // slave_shape: this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'type') + // }; + // if (DICTIONARY.cloud_provider !== 'azure' && this.cluster_type) { + // this.cluster_type.setDefaultOptions(this.model.resourceImages, + // this.model.selectedImage.template_name, 'cluster_type', 'template_name', 'array'); + // // if (this.model.selectedImage.image === 'docker.dlab-dataengine-service') + // // this.templates_list.setDefaultOptions(this.model.templates, + // // this.model.selectedItem.version, 'template', 'version', 'array'); + // } + // this.master_shapes_list && this.master_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, + // this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'master_shape', 'description', 'json'); + // this.slave_shapes_list && this.slave_shapes_list.setDefaultOptions(this.model.selectedImage.shapes.resourcesShapeTypes, + // this.shapePlaceholder(this.model.selectedImage.shapes.resourcesShapeTypes, 'description'), 'slave_shape', 'description', 'json'); + // } } private filterShapes(): void { if (this.notebook_instance.template_name.toLowerCase().indexOf('tensorflow') !== -1 || this.notebook_instance.template_name.toLowerCase().indexOf('deep learning') !== -1) { const allowed: any = ['GPU optimized']; - const filtered = Object.keys(this.model.selectedImage.shapes.resourcesShapeTypes) + const filtered = Object.keys(this.selectedImage.shapes.resourcesShapeTypes) .filter(key => allowed.includes(key)) .reduce((obj, key) => { - obj[key] = this.model.selectedImage.shapes.resourcesShapeTypes[key]; + obj[key] = this.selectedImage.shapes.resourcesShapeTypes[key]; return obj; }, {}); if (DICTIONARY.cloud_provider !== 'azure') { - const images = this.model.resourceImages.filter(image => image.image === 'docker.dlab-dataengine'); - this.model.resourceImages = images; - (images.length > 0) ? this.model.setSelectedClusterType(0) : this.model.availableTemplates = false; + const images = this.templates.filter(image => image.image === 'docker.dlab-dataengine'); + this.templates = images; + // (images.length > 0) ? this.model.setSelectedClusterType(0) : this.model.availableTemplates = false; } - this.model.selectedImage.shapes.resourcesShapeTypes = filtered; + this.selectedImage.shapes.resourcesShapeTypes = filtered; } } - private resetDialog(): void { - this.spotInstance = false; - this.initFormModel(); - this.getComputationalResourceLimits(); - this.model.resetModel(); + private getTemplates(project) { + this.userResourceService.getComputationalTemplates(project).subscribe( + templates => { + this.templates = templates; + this.selectedImage = templates[0]; + this.filterShapes(); + this.resourceForm.get('template_name').setValue(this.selectedImage.template_name) + }); + } + + + + - if (this.PROVIDER === 'aws' && this.spotInstancesSelect) - this.spotInstancesSelect.nativeElement['checked'] = false; - if (this.PROVIDER === 'gcp' && this.preemptible) - this.preemptible.nativeElement['checked'] = false; - } } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts index d53285a250..5e7b45d561 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts @@ -72,7 +72,7 @@ export class ComputationalResourceCreateModel { this.selectedItemChanged = selectedItemChanged; this.continueWith = continueWith; this.prepareModel(fnProcessResults, fnProcessErrors); - this.loadTemplates(); + // this.loadTemplates(); } public setSelectedItem(item: ComputationalResourceApplicationTemplate) { @@ -101,7 +101,7 @@ export class ComputationalResourceCreateModel { public loadTemplates(): void { if (this.resourceImages.length === 0) - this.userResourceService.getComputationalResourcesTemplates() + this.userResourceService.getComputationalTemplates('project-2') .subscribe( data => { let computationalResourceImage; From 0022849c5e217ee6e66d997b0814cad7b2c0621a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 13 Jun 2019 18:20:18 +0300 Subject: [PATCH 175/357] [DLAB-805]: replaced shapes controls selector --- ...onal-resource-create-dialog.component.html | 144 ++++++++++++------ ...tional-resource-create-dialog.component.ts | 21 +-- .../index.ts | 3 + 3 files changed, 114 insertions(+), 54 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index b8232cd8ac..a879139c1f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -24,56 +24,71 @@

Add computational resources

-
+
- - -
- -
- - Select project - - {{ template.template_name }} - Templates list is empty - - - -
+ + +
+ +
+ + Select cluster type + + {{ type.template_name }} + Clusters types list is empty + + + +
+
-
- -
- - This cluster name already exists. - - Cluster name cannot be longer than 10 characters and can only contain letters, numbers, hyphens and '_' but can not end with special characters - -
+
+ +
+ + Select template + + {{ template.version }} + Templates list is empty + + +
+
+
+ +
+ + This cluster name already exists. + + Cluster name cannot be longer than 10 characters and can only contain letters, numbers, hyphens and '_' but can not end with special characters + +
+
@@ -87,19 +102,58 @@

Add computational resources

-
- + -
+ + +
+ +
+ + Select {{ DICTIONARY.notebook_instance_size }} + + + + {{ list_item.Size }} {{ list_item.Type }} + + + + + +
+ +
+ +
+ + Select {{ DICTIONARY.notebook_instance_size }} + + + + {{ list_item.Size }} {{ list_item.Type }} + + + + + +
+
+
@@ -127,7 +181,7 @@

Add computational resources

+ [hidden]="!selectedImage.templates.length || !isAvailableSpots()">
- + Only integer values greater than or equal to {{minSpotPrice}} and less than {{maxSpotPrice}} are allowed
@@ -197,7 +197,7 @@

Add computational resources

-
- + + + - -
-
\ No newline at end of file +
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html index c8766ff671..6697e68ffa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html @@ -23,9 +23,9 @@

Manage Git Credentials

- + - @@ -63,7 +63,8 @@

Manage Git Credentials

- +
@@ -73,13 +74,16 @@

Manage Git Credentials

- +
- Hostname field is required. Please provide a qualified domain name (e.g. gitlab.com or github.com) - + The Host name is already in use
@@ -88,7 +92,8 @@

Manage Git Credentials

- + Username field is required. Please provide a valid username
@@ -97,7 +102,8 @@

Manage Git Credentials

- + Email field is required. Please provide a valid email
@@ -108,7 +114,8 @@

Manage Git Credentials

- + Login field is required. Please provide a valid login
@@ -117,7 +124,8 @@

Manage Git Credentials

- + Field is required. Password must be at least 6 characters
@@ -126,7 +134,8 @@

Manage Git Credentials

- + Field is required. Please confirm a password
@@ -134,7 +143,8 @@

Manage Git Credentials

-
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss index 228c048c47..60e40b1b3c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.scss @@ -22,22 +22,27 @@ height: 500px; padding: 25px 35px; } + .add-creds { - margin: 15px 5px; + margin: 15px 5px 0; } + .scrollingList { overflow-x: hidden; padding: 5px; height: 185px; + &.info { display: flex; justify-content: center; height: 300px; + p { align-self: center; } } } + .mail-field, .user-field, .login-field { @@ -46,6 +51,7 @@ text-overflow: ellipsis; padding: 5px; } + .hostname-field { width: 25%; overflow: hidden; @@ -53,18 +59,22 @@ padding: 5px; width: 30%; } + .actions { width: 20%; position: relative; overflow: visible; width: 50px; + span { position: absolute; top: -10px; left: 0; zoom: 0.8; + &.git-actions { cursor: pointer; + &.remove { left: 35px; } @@ -74,23 +84,28 @@ .git-form { display: flex; + .control-group { width: 100%; font-family: 'Open Sans', sans-serif; padding: 10px 0 25px; position: relative; + input[type='text'], input[type='password'], input[type='email'] { font-size: 14px; } + .label { width: 30%; font-size: 14px; } + .control { width: 70%; } + .danger_color { position: absolute; top: 45px; @@ -98,14 +113,17 @@ font-size: 12px; } } + .col { padding: 30px 10px; width: 50%; } + .danger_color { padding-top: 0; } } + .submit { margin-top: 60px; } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts index 7bd6538dad..e339acb604 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts @@ -44,7 +44,7 @@ export class ManageUngitComponent implements OnInit { public editableForm: boolean = false; public updateAccountCredentialsForm: FormGroup; - @ViewChild('tabGroup') tabGroup; + @ViewChild('tabGroupGit') tabGroupGit; constructor( public toastr: ToastrService, @@ -66,11 +66,11 @@ export class ManageUngitComponent implements OnInit { } public open(): void { - this.model = new MangeUngitModel(() => {}, + this.model = new MangeUngitModel(() => { }, error => this.toastr.error(error.message || 'Manage git credentials failed!', 'Oops!'), () => { - if (!this.gitCredentials.length) - this.tabGroup.selectedIndex = 1; + // if (!this.gitCredentials.length) + // this.tabGroupGit.selectedIndex = 1; }, this.manageUngitService); } @@ -87,7 +87,7 @@ export class ManageUngitComponent implements OnInit { } public editSpecificAccount(item: AccountCredentials) { - this.tabGroup.selectedIndex = 1; + this.tabGroupGit.selectedIndex = 1; this.currentEditableItem = item; this.updateAccountCredentialsForm = this._fb.group({ @@ -122,13 +122,13 @@ export class ManageUngitComponent implements OnInit { this.gitCredentials = modifiedCredentials; this.editableForm = true; - this.tabGroup.selectedIndex = 0; + this.tabGroupGit.selectedIndex = 0; this.resetForm(); } public editAccounts_btnClick() { this.model.confirmAction(this.gitCredentials); - this.tabGroup.selectedIndex = 0; + this.tabGroupGit.selectedIndex = 0; this.editableForm = false; this.toastr.success('Git credentials updated successfully!', 'Success!'); } From 2ff585863a8ed57f7f3ef0e5c6adb683c285f22f Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 18 Jun 2019 14:24:02 +0300 Subject: [PATCH 180/357] DLAB-778, 783, 788, 790 added possibility to use tags in resources --- .../com/epam/dlab/dto/UserInstanceDTO.java | 12 ++++-- .../AwsComputationalResource.java | 5 ++- .../SparkStandaloneClusterResource.java | 5 ++- .../UserComputationalResource.java | 5 ++- .../dto/exploratory/ExploratoryCreateDTO.java | 22 ++++++++++ .../GcpComputationalResource.java | 6 ++- .../dlab/model/exploratory/Exploratory.java | 2 + .../dlab/backendapi/domain/EndpointDTO.java | 1 + .../dlab/backendapi/domain/ProjectDTO.java | 2 + .../dlab/backendapi/modules/DevModule.java | 1 + .../backendapi/modules/ProductionModule.java | 1 + .../resources/ExploratoryResource.java | 2 + .../dto/ComputationalCreateFormDTO.java | 2 + .../dto/ExploratoryCreateFormDTO.java | 6 +++ .../dlab/backendapi/service/TagService.java | 9 +++++ .../backendapi/service/TagServiceImpl.java | 40 +++++++++++++++++++ .../impl/ComputationalServiceImpl.java | 24 ++++++----- .../service/impl/ExploratoryServiceImpl.java | 13 ++++-- .../dlab/backendapi/util/RequestBuilder.java | 12 ++++-- .../resources/ExploratoryResourceTest.java | 14 +++++-- .../impl/ComputationalServiceImplTest.java | 30 +++++++++----- .../impl/ExploratoryServiceImplTest.java | 28 ++++++++----- ...InfrastructureTemplateServiceBaseTest.java | 6 +-- .../backendapi/util/RequestBuilderTest.java | 6 +-- 24 files changed, 196 insertions(+), 58 deletions(-) create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java index 1cb4efc936..5dae5ef344 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java @@ -28,10 +28,7 @@ import lombok.Data; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Stores info about the user notebook. @@ -79,6 +76,8 @@ public class UserInstanceDTO { private LocalDateTime lastActivity; @JsonProperty("cluster_config") private List clusterConfig; + @JsonProperty + private Map tags; /** * Sets the user login name. @@ -174,4 +173,9 @@ public UserInstanceDTO withEndpoint(String endpoint) { setEndpoint(endpoint); return this; } + + public UserInstanceDTO withTags(Map tags) { + setTags(tags); + return this; + } } diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/computational/AwsComputationalResource.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/computational/AwsComputationalResource.java index 928733d501..8a268c5a29 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/computational/AwsComputationalResource.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/computational/AwsComputationalResource.java @@ -31,6 +31,7 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.List; +import java.util.Map; /** * Stores info about the user's computational resources for notebook. @@ -62,10 +63,10 @@ public AwsComputationalResource(String computationalName, String computationalId String instanceId, String masterShape, String slaveShape, Boolean slaveSpot, Integer slaveSpotPctPrice, String slaveNumber, String version, List resourceURL, LocalDateTime lastActivity, - List config) { + List config, Map tags) { super(computationalName, computationalId, imageName, templateName, status, uptime, schedulerJobData, - reuploadKeyRequired, resourceURL, lastActivity); + reuploadKeyRequired, resourceURL, lastActivity, tags); this.instanceId = instanceId; this.masterShape = masterShape; this.slaveShape = slaveShape; diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/SparkStandaloneClusterResource.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/SparkStandaloneClusterResource.java index 50d2c488b1..82f5660584 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/SparkStandaloneClusterResource.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/SparkStandaloneClusterResource.java @@ -32,6 +32,7 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.List; +import java.util.Map; @Data @EqualsAndHashCode(callSuper = true) @@ -51,10 +52,10 @@ public SparkStandaloneClusterResource(String computationalName, String computati SchedulerJobDTO schedulerJobData, boolean reuploadKeyRequired, String dataEngineInstanceCount, String dataEngineInstanceShape, List resourceURL, LocalDateTime lastActivity, - List config) { + List config, Map tags) { super(computationalName, computationalId, imageName, templateName, status, uptime, schedulerJobData, - reuploadKeyRequired, resourceURL, lastActivity); + reuploadKeyRequired, resourceURL, lastActivity, tags); this.dataEngineInstanceCount = dataEngineInstanceCount; this.dataEngineInstanceShape = dataEngineInstanceShape; this.config = config; diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java index 14f2b4a729..678025f9f7 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java @@ -31,6 +31,7 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.List; +import java.util.Map; @Data @NoArgsConstructor @@ -63,11 +64,12 @@ public class UserComputationalResource { @JsonProperty("instance_id") private String instanceId; protected List config; + private Map tags; public UserComputationalResource(String computationalName, String computationalId, String imageName, String templateName, String status, Date uptime, SchedulerJobDTO schedulerData, boolean reuploadKeyRequired, List resourceUrl, - LocalDateTime lastActivity) { + LocalDateTime lastActivity, Map tags) { this.computationalName = computationalName; this.computationalId = computationalId; this.imageName = imageName; @@ -78,6 +80,7 @@ public UserComputationalResource(String computationalName, String computationalI this.reuploadKeyRequired = reuploadKeyRequired; this.resourceUrl = resourceUrl; this.lastActivity = lastActivity; + this.tags = tags; } public DataEngineType getDataEngineType() { diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCreateDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCreateDTO.java index 9eca9612dd..0a4c407f8b 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCreateDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCreateDTO.java @@ -24,6 +24,7 @@ import com.google.common.base.MoreObjects.ToStringHelper; import java.util.List; +import java.util.Map; public class ExploratoryCreateDTO> extends ExploratoryBaseDTO { @@ -36,6 +37,12 @@ public class ExploratoryCreateDTO> extends Exp private String imageName; @JsonProperty("spark_configurations") private List clusterConfig; + @JsonProperty("tags") + private Map tags; + @JsonProperty("project") + private String project; + @JsonProperty("endpoint") + private String endpoint; /** * Return the list of GIT credentials. @@ -67,6 +74,21 @@ public T withImageName(String imageName) { return self; } + public T withTags(Map tags) { + this.tags = tags; + return self; + } + + public T withEndpoint(String endpoint) { + this.endpoint = endpoint; + return self; + } + + public T withProject(String project) { + this.project = project; + return self; + } + public String getImageName() { return imageName; } diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/computational/GcpComputationalResource.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/computational/GcpComputationalResource.java index 061fa06344..b56bbd89e0 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/computational/GcpComputationalResource.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/computational/GcpComputationalResource.java @@ -31,6 +31,7 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.List; +import java.util.Map; /** * Stores info about the user's computational resources for notebook. @@ -61,9 +62,10 @@ public GcpComputationalResource(String computationalName, String computationalId SchedulerJobDTO schedulerJobData, boolean reuploadKeyRequired, String instanceId, String masterShape, String slaveShape, String slaveNumber, String masterNumber, String preemptibleNumber, String version, - List resourceURL, LocalDateTime lastActivity) { + List resourceURL, LocalDateTime lastActivity, + Map tags) { super(computationalName, computationalId, imageName, templateName, status, uptime, schedulerJobData, - reuploadKeyRequired, resourceURL, lastActivity); + reuploadKeyRequired, resourceURL, lastActivity, tags); this.instanceId = instanceId; this.masterShape = masterShape; this.slaveShape = slaveShape; diff --git a/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java b/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java index dd8dcbbdb0..4b67f702a4 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java @@ -35,5 +35,7 @@ public class Exploratory { private final String shape; private final String imageName; private final String endpoint; + private final String project; + private final String exploratoryTag; private final List clusterConfig; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java index e3c467cde8..15c2f1853c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java @@ -10,4 +10,5 @@ public class EndpointDTO { private final String name; private final String url; private final String account; + private final String tag; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 1b60b598fd..07b281fc42 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -15,5 +15,7 @@ public class ProjectDTO { private final Set endpoints; @NotNull private final Set groups; + @NotNull + private final String tag; private final Integer budget; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java index 2f6ae9b6a4..dc24362840 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java @@ -76,6 +76,7 @@ protected void configure() { bind(BackupService.class).to(BackupServiceImpl.class); bind(BackupDao.class).to(BackupDaoImpl.class); bind(ExploratoryService.class).to(ExploratoryServiceImpl.class); + bind(TagService.class).to(TagServiceImpl.class); bind(InactivityService.class).to(InactivityServiceImpl.class); bind(SystemUserInfoService.class).toInstance(new SystemUserInfoService() { @Override diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java index 2ed65c40ae..4a3bc7057d 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java @@ -91,5 +91,6 @@ protected void configure() { bind(EndpointDAO.class).to(EndpointDAOImpl.class); bind(ProjectService.class).to(ProjectServiceImpl.class); bind(ProjectDAO.class).to(ProjectDAOImpl.class); + bind(TagService.class).to(TagServiceImpl.class); } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java index e6aa295c47..d397e9802c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java @@ -169,6 +169,8 @@ private Exploratory getExploratory(ExploratoryCreateFormDTO formDTO) { .clusterConfig(formDTO.getClusterConfig()) .shape(formDTO.getShape()) .endpoint(formDTO.getEndpoint()) + .project(formDTO.getProject()) + .exploratoryTag(formDTO.getExploratoryTag()) .build(); } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalCreateFormDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalCreateFormDTO.java index baf9bc70d3..ce619e41e7 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalCreateFormDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ComputationalCreateFormDTO.java @@ -48,6 +48,8 @@ public class ComputationalCreateFormDTO { @NotBlank @JsonProperty private String project; + @JsonProperty("custom_tag") + private String customTag; @NotBlank @JsonProperty("notebook_name") diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java index 2cb334488c..18de17a4f0 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreateFormDTO.java @@ -45,6 +45,8 @@ public class ExploratoryCreateFormDTO { @NotBlank @JsonProperty private String project; + @JsonProperty + private String exploratoryTag; @NotBlank @JsonProperty @@ -168,6 +170,10 @@ public void setEndpoint(String endpoint) { this.endpoint = endpoint; } + public String getExploratoryTag() { + return exploratoryTag; + } + @Override public String toString() { return MoreObjects.toStringHelper(this) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java new file mode 100644 index 0000000000..f436f6d6ea --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java @@ -0,0 +1,9 @@ +package com.epam.dlab.backendapi.service; + +import com.epam.dlab.auth.UserInfo; + +import java.util.Map; + +public interface TagService { + Map getResourceTags(UserInfo userInfo, String endpoint, String project, String customTag); +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java new file mode 100644 index 0000000000..c60181551a --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java @@ -0,0 +1,40 @@ +package com.epam.dlab.backendapi.service; + +import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.dao.EndpointDAO; +import com.epam.dlab.backendapi.dao.ProjectDAO; +import com.epam.dlab.backendapi.domain.EndpointDTO; +import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +@Singleton +public class TagServiceImpl implements TagService { + private final EndpointDAO endpointDAO; + private final ProjectDAO projectDAO; + + @Inject + public TagServiceImpl(EndpointDAO endpointDAO, ProjectDAO projectDAO) { + this.endpointDAO = endpointDAO; + this.projectDAO = projectDAO; + } + + @Override + public Map getResourceTags(UserInfo userInfo, String endpoint, String project, + String customTag) { + Map tags = new HashMap<>(); + tags.put("user_tag", userInfo.getName()); + endpointDAO.get(endpoint) + .map(EndpointDTO::getTag) + .ifPresent(tag -> tags.put("endpoint_tag", tag)); + projectDAO.get(project) + .map(ProjectDTO::getTag) + .ifPresent(tag -> tags.put("project_tag", tag)); + Optional.ofNullable(customTag).ifPresent(t -> tags.put("custom_tag", t)); + return tags; + } +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java index cc4ae0ae0f..4a6ab80794 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java @@ -29,6 +29,7 @@ import com.epam.dlab.backendapi.resources.dto.ComputationalCreateFormDTO; import com.epam.dlab.backendapi.resources.dto.SparkStandaloneClusterCreateForm; import com.epam.dlab.backendapi.service.ComputationalService; +import com.epam.dlab.backendapi.service.TagService; import com.epam.dlab.backendapi.util.RequestBuilder; import com.epam.dlab.constants.ServiceConsts; import com.epam.dlab.dto.UserInstanceDTO; @@ -48,6 +49,7 @@ import java.util.EnumMap; import java.util.List; +import java.util.Map; import java.util.Optional; import static com.epam.dlab.dto.UserInstanceStatus.*; @@ -81,12 +83,12 @@ public class ComputationalServiceImpl implements ComputationalService { @Inject @Named(ServiceConsts.PROVISIONING_SERVICE_NAME) private RESTService provisioningService; - @Inject private RequestBuilder requestBuilder; - @Inject private RequestId requestId; + @Inject + private TagService tagService; @BudgetLimited @@ -94,13 +96,14 @@ public class ComputationalServiceImpl implements ComputationalService { public boolean createSparkCluster(UserInfo userInfo, SparkStandaloneClusterCreateForm form, @Project String project) { - if (computationalDAO.addComputational(userInfo.getName(), form.getNotebookName(), - createInitialComputationalResource(form))) { + final UserInstanceDTO instance = + exploratoryDAO.fetchExploratoryFields(userInfo.getName(), form.getNotebookName()); + final SparkStandaloneClusterResource compResource = createInitialComputationalResource(form); + compResource.setTags(tagService.getResourceTags(userInfo, instance.getEndpoint(), project, + form.getCustomTag())); + if (computationalDAO.addComputational(userInfo.getName(), form.getNotebookName(), compResource)) { try { - UserInstanceDTO instance = - exploratoryDAO.fetchExploratoryFields(userInfo.getName(), form.getNotebookName()); - ComputationalBase dto = requestBuilder.newComputationalCreate(userInfo, instance, form); String uuid = provisioningService.post(ComputationalAPI.COMPUTATIONAL_CREATE_SPARK, @@ -157,13 +160,16 @@ public void terminateComputational(UserInfo userInfo, String exploratoryName, St public boolean createDataEngineService(UserInfo userInfo, ComputationalCreateFormDTO formDTO, UserComputationalResource computationalResource, @Project String project) { + final UserInstanceDTO instance = exploratoryDAO.fetchExploratoryFields(userInfo.getName(), formDTO + .getNotebookName()); + final Map tags = tagService.getResourceTags(userInfo, instance.getEndpoint(), project, + formDTO.getCustomTag()); + computationalResource.setTags(tags); boolean isAdded = computationalDAO.addComputational(userInfo.getName(), formDTO.getNotebookName(), computationalResource); if (isAdded) { try { - UserInstanceDTO instance = exploratoryDAO.fetchExploratoryFields(userInfo.getName(), formDTO - .getNotebookName()); String uuid = provisioningService.post(COMPUTATIONAL_CREATE_CLOUD_SPECIFIC, userInfo.getAccessToken(), requestBuilder.newComputationalCreate(userInfo, instance, formDTO), String.class); requestId.put(userInfo.getName(), uuid); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java index 0489f7164a..a043b5205e 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java @@ -28,6 +28,7 @@ import com.epam.dlab.backendapi.dao.ImageExploratoryDao; import com.epam.dlab.backendapi.domain.RequestId; import com.epam.dlab.backendapi.service.ExploratoryService; +import com.epam.dlab.backendapi.service.TagService; import com.epam.dlab.backendapi.util.RequestBuilder; import com.epam.dlab.constants.ServiceConsts; import com.epam.dlab.dto.StatusEnvBaseDTO; @@ -73,6 +74,8 @@ public class ExploratoryServiceImpl implements ExploratoryService { private RequestBuilder requestBuilder; @Inject private RequestId requestId; + @Inject + private TagService tagService; @BudgetLimited @Override @@ -95,12 +98,14 @@ public String terminate(UserInfo userInfo, String exploratoryName) { public String create(UserInfo userInfo, Exploratory exploratory, @Project String project) { boolean isAdded = false; try { - exploratoryDAO.insertExploratory(getUserInstanceDTO(userInfo, exploratory, project)); + final UserInstanceDTO userInstanceDTO = getUserInstanceDTO(userInfo, exploratory, project); + exploratoryDAO.insertExploratory(userInstanceDTO); isAdded = true; final ExploratoryGitCredsDTO gitCreds = gitCredsDAO.findGitCreds(userInfo.getName()); log.debug("Created exploratory environment {} for user {}", exploratory.getName(), userInfo.getName()); final String uuid = provisioningService.post(EXPLORATORY_CREATE, userInfo.getAccessToken(), - requestBuilder.newExploratoryCreate(exploratory, userInfo, gitCreds), String.class); + requestBuilder.newExploratoryCreate(exploratory, userInfo, gitCreds, userInstanceDTO.getTags()), + String.class); requestId.put(userInfo.getName(), uuid); return uuid; } catch (Exception t) { @@ -321,7 +326,9 @@ private UserInstanceDTO getUserInstanceDTO(UserInfo userInfo, Exploratory explor .withClusterConfig(exploratory.getClusterConfig()) .withShape(exploratory.getShape()) .withProject(project) - .withEndpoint(exploratory.getEndpoint()); + .withEndpoint(exploratory.getEndpoint()) + .withTags(tagService.getResourceTags(userInfo, exploratory.getEndpoint(), project, + exploratory.getExploratoryTag())); if (StringUtils.isNotBlank(exploratory.getImageName())) { final List libInstallDtoList = getImageRelatedLibraries(userInfo, exploratory .getImageName()); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java index b120c53b21..350fa0ea87 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java @@ -68,6 +68,7 @@ import com.google.inject.Singleton; import java.util.List; +import java.util.Map; import java.util.UUID; import static com.epam.dlab.cloud.CloudProvider.*; @@ -196,7 +197,8 @@ public UserEnvironmentResources newUserEnvironmentStatus(UserInfo userInfo) { @SuppressWarnings("unchecked") public > T newExploratoryCreate(Exploratory exploratory, UserInfo userInfo, - ExploratoryGitCredsDTO exploratoryGitCredsDTO) { + ExploratoryGitCredsDTO exploratoryGitCredsDTO, + Map tags) { T exploratoryCreate; @@ -220,7 +222,6 @@ public > T newExploratoryCreate(Exploratory ex exploratoryCreate = (T) newResourceSysBaseDTO(userInfo, ExploratoryCreateGcp.class) .withNotebookInstanceType(exploratory.getShape()); break; - default: throw new IllegalArgumentException(UNSUPPORTED_CLOUD_PROVIDER_MESSAGE + cloudProvider()); } @@ -230,7 +231,10 @@ public > T newExploratoryCreate(Exploratory ex .withApplicationName(getApplicationNameFromImage(exploratory.getDockerImage())) .withGitCreds(exploratoryGitCredsDTO.getGitCreds()) .withImageName(exploratory.getImageName()) - .withClusterConfig(exploratory.getClusterConfig()); + .withClusterConfig(exploratory.getClusterConfig()) + .withProject(exploratory.getProject()) + .withEndpoint(exploratory.getEndpoint()) + .withTags(tags); } @SuppressWarnings("unchecked") @@ -586,7 +590,7 @@ public ExploratoryReconfigureSparkClusterActionDTO newClusterConfigUpdate(UserIn return dto; - } + } public ExploratoryCheckInactivityAction newExploratoryCheckInactivityAction(UserInfo userInfo, UserInstanceDTO userInstance) { diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java index 0462732230..25cc0b70f9 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ExploratoryResourceTest.java @@ -63,7 +63,8 @@ public void setup() throws AuthenticationException { @Test public void create() { - when(exploratoryService.create(any(UserInfo.class), any(Exploratory.class), anyString())).thenReturn("someUuid"); + when(exploratoryService.create(any(UserInfo.class), any(Exploratory.class), anyString())).thenReturn( + "someUuid"); final Response response = resources.getJerseyTest() .target("/infrastructure_provision/exploratory_environment") .request() @@ -74,14 +75,16 @@ public void create() { assertEquals("someUuid", response.readEntity(String.class)); assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - verify(exploratoryService).create(getUserInfo(), getExploratory(getExploratoryCreateFormDTO()), "project"); + verify(exploratoryService).create(refEq(getUserInfo()), refEq(getExploratory(getExploratoryCreateFormDTO())), + eq("project")); verifyNoMoreInteractions(exploratoryService); } @Test public void createWithFailedAuth() throws AuthenticationException { authFailSetup(); - when(exploratoryService.create(any(UserInfo.class), any(Exploratory.class), anyString())).thenReturn("someUuid"); + when(exploratoryService.create(any(UserInfo.class), any(Exploratory.class), anyString())).thenReturn( + "someUuid"); final Response response = resources.getJerseyTest() .target("/infrastructure_provision/exploratory_environment") .request() @@ -304,6 +307,7 @@ private ExploratoryCreateFormDTO getExploratoryCreateFormDTO() { ecfDto.setVersion("someVersion"); ecfDto.setImageName("someImageName"); ecfDto.setProject("project"); + ecfDto.setEndpoint("endpoint"); return ecfDto; } @@ -318,6 +322,8 @@ private Exploratory getExploratory(@Valid @NotNull ExploratoryCreateFormDTO form .imageName(formDTO.getImageName()) .templateName(formDTO.getTemplateName()) .version(formDTO.getVersion()) - .shape(formDTO.getShape()).build(); + .shape(formDTO.getShape()) + .endpoint(formDTO.getEndpoint()) + .project(formDTO.getProject()).build(); } } diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java index 03e0c0bc47..6da6ee8883 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java @@ -26,6 +26,7 @@ import com.epam.dlab.backendapi.domain.RequestId; import com.epam.dlab.backendapi.resources.dto.ComputationalCreateFormDTO; import com.epam.dlab.backendapi.resources.dto.SparkStandaloneClusterCreateForm; +import com.epam.dlab.backendapi.service.TagService; import com.epam.dlab.backendapi.util.RequestBuilder; import com.epam.dlab.dto.SchedulerJobDTO; import com.epam.dlab.dto.UserInstanceDTO; @@ -96,6 +97,8 @@ public class ComputationalServiceImplTest { private RequestBuilder requestBuilder; @Mock private RequestId requestId; + @Mock + private TagService tagService; @InjectMocks private ComputationalServiceImpl computationalService; @@ -151,9 +154,12 @@ public void createSparkCluster() { public void createSparkClusterWhenResourceAlreadyExists() { when(computationalDAO.addComputational(anyString(), anyString(), any(SparkStandaloneClusterResource.class))).thenReturn(false); + when(exploratoryDAO.fetchExploratoryFields(anyString(), anyString())).thenReturn(userInstance); + boolean creationResult = - computationalService.createSparkCluster(userInfo, (SparkStandaloneClusterCreateForm) formList.get(0), ""); + computationalService.createSparkCluster(userInfo, (SparkStandaloneClusterCreateForm) formList.get(0), + ""); assertFalse(creationResult); verify(computationalDAO).addComputational(eq(USER), eq(EXPLORATORY_NAME), refEq(sparkClusterResource)); @@ -172,13 +178,13 @@ public void createSparkClusterWhenMethodFetchExploratoryFieldsThrowsException() SparkStandaloneClusterCreateForm sparkClusterCreateForm = (SparkStandaloneClusterCreateForm) formList.get(0); try { - computationalService.createSparkCluster(userInfo, sparkClusterCreateForm,""); + computationalService.createSparkCluster(userInfo, sparkClusterCreateForm, ""); } catch (ResourceNotFoundException e) { assertEquals("Exploratory for user with name not found", e.getMessage()); } - verify(computationalDAO).addComputational(USER, EXPLORATORY_NAME, sparkClusterResource); - verify(computationalDAO).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, "self")); + verify(computationalDAO, never()).addComputational(USER, EXPLORATORY_NAME, sparkClusterResource); + verify(computationalDAO, never()).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, "self")); verify(exploratoryDAO).fetchExploratoryFields(USER, EXPLORATORY_NAME); verifyNoMoreInteractions(configuration, computationalDAO, exploratoryDAO); } @@ -366,10 +372,12 @@ public void createDataEngineService() { @Test public void createDataEngineServiceWhenComputationalResourceNotAdded() { + when(exploratoryDAO.fetchExploratoryFields(anyString(), anyString())).thenReturn(userInstance); when(computationalDAO.addComputational(anyString(), anyString(), any(UserComputationalResource.class))) .thenReturn(false); - boolean creationResult = computationalService.createDataEngineService(userInfo, formList.get(1), ucResource, ""); + boolean creationResult = computationalService.createDataEngineService(userInfo, formList.get(1), ucResource, + ""); assertFalse(creationResult); verify(computationalDAO).addComputational(eq(USER), eq(EXPLORATORY_NAME), refEq(ucResource)); @@ -389,16 +397,15 @@ public void createDataEngineServiceWhenMethodFetchExploratoryFieldsThrowsExcepti try { computationalService.createDataEngineService(userInfo, formList.get(1), ucResource, ""); } catch (DlabException e) { - assertEquals("Could not send request for creation the computational resource compName: " + - "Exploratory for user with name not found", e.getMessage()); + assertEquals("Exploratory for user with name not found", e.getMessage()); } - verify(computationalDAO) + verify(computationalDAO, never()) .addComputational(eq(USER), eq(EXPLORATORY_NAME), refEq(ucResource)); verify(exploratoryDAO).fetchExploratoryFields(USER, EXPLORATORY_NAME); - verify(computationalDAO).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, "self")); + verify(computationalDAO, never()).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, "self")); verifyNoMoreInteractions(computationalDAO, exploratoryDAO); } @@ -658,7 +665,7 @@ private UserInfo getUserInfo() { } private UserInstanceDTO getUserInstanceDto() { - return new UserInstanceDTO().withUser(USER).withExploratoryName(EXPLORATORY_NAME); + return new UserInstanceDTO().withUser(USER).withExploratoryName(EXPLORATORY_NAME).withTags(Collections.emptyMap()); } private List getFormList() { @@ -670,6 +677,7 @@ private List getFormList() { ComputationalCreateFormDTO desClusterForm = new ComputationalCreateFormDTO(); desClusterForm.setNotebookName(EXPLORATORY_NAME); desClusterForm.setName(COMP_NAME); + return Arrays.asList(sparkClusterForm, desClusterForm); } @@ -687,6 +695,7 @@ private SparkStandaloneClusterResource getSparkClusterResource() { .imageName("dataengine") .status(CREATING.toString()) .dataEngineInstanceCount(String.valueOf(2)) + .tags(Collections.emptyMap()) .build(); } @@ -698,6 +707,7 @@ private UserComputationalResource getUserComputationalResource(UserInstanceStatu ucResource.setStatus(status.toString()); ucResource.setLastActivity(LAST_ACTIVITY); ucResource.setComputationalId(COMP_ID); + ucResource.setTags(Collections.emptyMap()); final SchedulerJobDTO schedulerData = new SchedulerJobDTO(); schedulerData.setCheckInactivityRequired(true); schedulerData.setMaxInactivity(MAX_INACTIVITY); diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java index a3d96826a7..6a4e771209 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java @@ -24,6 +24,7 @@ import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.dao.GitCredsDAO; import com.epam.dlab.backendapi.domain.RequestId; +import com.epam.dlab.backendapi.service.TagService; import com.epam.dlab.backendapi.util.RequestBuilder; import com.epam.dlab.dto.StatusEnvBaseDTO; import com.epam.dlab.dto.UserInstanceDTO; @@ -78,6 +79,8 @@ public class ExploratoryServiceImplTest { private RequestBuilder requestBuilder; @Mock private RequestId requestId; + @Mock + private TagService tagService; @InjectMocks private ExploratoryServiceImpl exploratoryService; @@ -109,7 +112,7 @@ public void start() { .thenReturn(UUID); when(requestId.put(anyString(), anyString())).thenReturn(UUID); - String uuid = exploratoryService.start(userInfo, EXPLORATORY_NAME, ""); + String uuid = exploratoryService.start(userInfo, EXPLORATORY_NAME, "project"); assertNotNull(uuid); assertEquals(UUID, uuid); @@ -128,7 +131,7 @@ public void startWhenMethodFetchExploratoryFieldsThrowsException() { doThrow(new ResourceNotFoundException("Exploratory for user with name not found")) .when(exploratoryDAO).fetchExploratoryFields(anyString(), anyString()); try { - exploratoryService.start(userInfo, EXPLORATORY_NAME, ""); + exploratoryService.start(userInfo, EXPLORATORY_NAME, "project"); } catch (DlabException e) { assertEquals("Could not exploratory/start exploratory environment expName: Exploratory for user with " + "name not found", e.getMessage()); @@ -254,13 +257,13 @@ public void create() { ExploratoryCreateDTO ecDto = new ExploratoryCreateDTO(); Exploratory exploratory = Exploratory.builder().name(EXPLORATORY_NAME).build(); when(requestBuilder.newExploratoryCreate(any(Exploratory.class), any(UserInfo.class), - any(ExploratoryGitCredsDTO.class))).thenReturn(ecDto); + any(ExploratoryGitCredsDTO.class), anyMapOf(String.class, String.class))).thenReturn(ecDto); String exploratoryCreate = "exploratory/create"; when(provisioningService.post(anyString(), anyString(), any(ExploratoryCreateDTO.class), any())) .thenReturn(UUID); when(requestId.put(anyString(), anyString())).thenReturn(UUID); - String uuid = exploratoryService.create(userInfo, exploratory, ""); + String uuid = exploratoryService.create(userInfo, exploratory, "project"); assertNotNull(uuid); assertEquals(UUID, uuid); @@ -268,7 +271,7 @@ public void create() { userInstance.withResources(Collections.emptyList()); verify(exploratoryDAO).insertExploratory(userInstance); verify(gitCredsDAO).findGitCreds(USER); - verify(requestBuilder).newExploratoryCreate(exploratory, userInfo, egcDto); + verify(requestBuilder).newExploratoryCreate(exploratory, userInfo, egcDto, Collections.emptyMap()); verify(provisioningService).post(exploratoryCreate, TOKEN, ecDto, String.class); verify(requestId).put(USER, UUID); verifyNoMoreInteractions(exploratoryDAO, gitCredsDAO, requestBuilder, provisioningService, requestId); @@ -283,7 +286,7 @@ public void createWhenMethodInsertExploratoryThrowsException() { "Exploratory for user with name not found"); Exploratory exploratory = Exploratory.builder().name(EXPLORATORY_NAME).build(); - exploratoryService.create(userInfo, exploratory, ""); + exploratoryService.create(userInfo, exploratory, "project"); } @Test @@ -291,7 +294,7 @@ public void createWhenMethodInsertExploratoryThrowsExceptionWithItsCatching() { doThrow(new RuntimeException()).when(exploratoryDAO).insertExploratory(any(UserInstanceDTO.class)); Exploratory exploratory = Exploratory.builder().name(EXPLORATORY_NAME).build(); try { - exploratoryService.create(userInfo, exploratory, ""); + exploratoryService.create(userInfo, exploratory, "project"); } catch (DlabException e) { assertEquals("Could not create exploratory environment expName for user test: null", e.getMessage()); @@ -312,11 +315,12 @@ public void createWhenMethodNewExploratoryCreateThrowsException() { Exploratory exploratory = Exploratory.builder().name(EXPLORATORY_NAME).build(); doThrow(new DlabException("Cannot create instance of resource class ")).when(requestBuilder) - .newExploratoryCreate(any(Exploratory.class), any(UserInfo.class), any(ExploratoryGitCredsDTO.class)); + .newExploratoryCreate(any(Exploratory.class), any(UserInfo.class), any(ExploratoryGitCredsDTO.class), + anyMapOf(String.class, String.class)); when(exploratoryDAO.updateExploratoryStatus(any(StatusEnvBaseDTO.class))).thenReturn(mock(UpdateResult.class)); try { - exploratoryService.create(userInfo, exploratory, ""); + exploratoryService.create(userInfo, exploratory, "project"); } catch (DlabException e) { assertEquals("Could not create exploratory environment expName for user test: Cannot create instance " + "of resource class ", e.getMessage()); @@ -328,7 +332,7 @@ public void createWhenMethodNewExploratoryCreateThrowsException() { userInstance.withResources(Collections.emptyList()); verify(exploratoryDAO).insertExploratory(userInstance); verify(gitCredsDAO).findGitCreds(USER); - verify(requestBuilder).newExploratoryCreate(exploratory, userInfo, egcDto); + verify(requestBuilder).newExploratoryCreate(exploratory, userInfo, egcDto, Collections.emptyMap()); verify(exploratoryDAO).updateExploratoryStatus(refEq(statusEnvBaseDTO, "self")); verifyNoMoreInteractions(exploratoryDAO, gitCredsDAO, requestBuilder); } @@ -526,7 +530,9 @@ private UserInstanceDTO getUserInstanceDto() { compResource.setStatus("stopped"); compResource.setComputationalId("compId"); return new UserInstanceDTO().withUser(USER).withExploratoryName(EXPLORATORY_NAME).withStatus("running") - .withResources(singletonList(compResource)); + .withResources(singletonList(compResource)) + .withTags(Collections.emptyMap()) + .withProject("project"); } private StatusEnvBaseDTO getStatusEnvBaseDTOWithStatus(String status) { diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java index 770274e47e..b2979fa975 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java @@ -77,7 +77,7 @@ public void getExploratoryTemplates() { emDto2.setExploratoryEnvironmentShapes(shapes2); List expectedEmdDtoList = Arrays.asList(emDto1, emDto2); when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), - Collections.singleton("project"), null))); + Collections.singleton("project"), null, null))); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedEmdDtoList.toArray()); when(settingsDAO.getConfOsFamily()).thenReturn("someConfOsFamily"); @@ -116,7 +116,7 @@ public void getComputationalTemplates() throws NoSuchFieldException, IllegalAcce computationalMetadataDTO ); when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), - Collections.singleton("project"), null))); + Collections.singleton("project"), null, null))); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedCmdDtoList.toArray(new ComputationalMetadataDTO[]{})); List expectedFullCmdDtoList = expectedCmdDtoList.stream() @@ -158,7 +158,7 @@ public void getComputationalTemplatesWithInapproprietaryImageName() { List expectedCmdDtoList = Collections.singletonList(computationalMetadataDTO); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedCmdDtoList.toArray(new ComputationalMetadataDTO[]{})); when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), - Collections.singleton("project"), null))); + Collections.singleton("project"), null, null))); UserInfo userInfo = new UserInfo("test", "token"); try { diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/util/RequestBuilderTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/util/RequestBuilderTest.java index adb46f0875..ff3e76510a 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/util/RequestBuilderTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/util/RequestBuilderTest.java @@ -308,7 +308,7 @@ public void newExploratoryCreateForAws() { when(settingsDAO.getAwsVpcId()).thenReturn("someAwsVpcId"); when(settingsDAO.getConfTagResourceId()).thenReturn("someConfTagResourceId"); - requestBuilder.newExploratoryCreate(exploratory, userInfo, egcDto); + requestBuilder.newExploratoryCreate(exploratory, userInfo, egcDto, null); verify(configuration, times(3)).getCloudProvider(); verify(settingsDAO).getServiceBaseName(); @@ -336,7 +336,7 @@ public void newExploratoryCreateForAzure() { when(settingsDAO.getAzureVpcName()).thenReturn("someAzureVpcId"); when(settingsDAO.getAzureDataLakeClientId()).thenReturn("someId"); - requestBuilder.newExploratoryCreate(exploratory, userInfo, egcDto); + requestBuilder.newExploratoryCreate(exploratory, userInfo, egcDto, null); verify(configuration, times(3)).getCloudProvider(); verify(settingsDAO, times(2)).isAzureDataLakeEnabled(); @@ -357,7 +357,7 @@ public void newExploratoryCreateForGcp() { when(settingsDAO.getServiceBaseName()).thenReturn("someSBN"); when(settingsDAO.getConfOsFamily()).thenReturn("someConfOsFamily"); - requestBuilder.newExploratoryCreate(exploratory, userInfo, egcDto); + requestBuilder.newExploratoryCreate(exploratory, userInfo, egcDto, null); verify(configuration, times(3)).getCloudProvider(); verify(configuration).getMaxUserNameLength(); From 08d52731d946e21bd0a8f1132ae74ad38051efef Mon Sep 17 00:00:00 2001 From: Mykola Bodnar1 Date: Tue, 18 Jun 2019 15:18:17 +0300 Subject: [PATCH 181/357] project creatin (subnet creation) (/project_prepare.py fixed) --- .../src/general/scripts/aws/project_prepare.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py index cfc04b39d7..59e229a290 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py @@ -29,7 +29,7 @@ import traceback if __name__ == "__main__": - local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_tag'], os.environ['request_id']) local_log_filepath = "/logs/project/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -39,16 +39,17 @@ print('Generating infrastructure names and tags') project_conf = dict() project_conf['service_base_name'] = os.environ['conf_service_base_name'] - project_conf['project_name'] = os.environ['project_name'] + project_conf['project_tag_value'] = os.environ['project_tag'] project_conf['vpc_id'] = os.environ['aws_vpc_id'] project_conf['vpc2_id'] = os.environ['aws_notebook_vpc_id'] project_conf['region'] = os.environ['aws_region'] - project_conf['tag_name'] = '{}-{}-Tag'.format(project_conf['service_base_name'], project_conf['project_name']) - project_conf['tag_name_value'] = '{0}-{1}-subnet'.format(project_conf['service_base_name'], project_conf['project_name']) - project_conf['private_subnet_prefix'] = os.environ['aws_private_subnet_prefix'] - project_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(project_conf['service_base_name'], project_conf['project_name']) project_conf['zone'] = os.environ['aws_region'] + os.environ['aws_zone'] - project_conf['secondary'] = 'false' + project_conf['tag_name'] = '{}-Tag'.format(project_conf['service_base_name']) + project_conf['tag_name_value'] = '{0}-{1}-subnet'.format(project_conf['service_base_name'], project_conf['project_tag_value']) + project_conf['private_subnet_prefix'] = os.environ['aws_private_subnet_prefix'] + project_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(project_conf['service_base_name'], project_conf['project_tag_value']) + + try: if os.environ['conf_user_subnets_range'] == '': @@ -70,7 +71,7 @@ project_conf['private_subnet_prefix'], os.environ['conf_user_subnets_range'], project_conf['private_subnet_name'], project_conf['zone']) try: - create_rt(project_conf['vpc2_id'], project_conf['tag_name'], project_conf['tag_name_value'], ) + create_rt(project_conf['vpc2_id'], project_conf['tag_name'], project_conf['service_base_name'], os.environ['secondary']) local("~/scripts/{}.py {}".format('common_create_subnet', params)) except: traceback.print_exc() From 74026f1085683e2d2a283dcf6818a11deb1610bd Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 18 Jun 2019 20:42:35 +0300 Subject: [PATCH 182/357] [DLAB-805]: configuration parameters control fixes --- .../create-environment/create-environment.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts index e17dac4e2b..0dca14b9ce 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts @@ -97,7 +97,7 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { ? JSON.stringify(CLUSTER_CONFIGURATION.SPARK, undefined, 2) : ''; document.querySelector('#config').scrollIntoView({ block: 'start', behavior: 'smooth' }); - this.createExploratoryForm.controls['configuration_parameters'].setValue(value); + this.createExploratoryForm.controls['cluster_config'].setValue(value); } private initFormModel(): void { From b4ba5ca92ffc698104174297ec43bffc81821e7f Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 18 Jun 2019 20:43:35 +0300 Subject: [PATCH 183/357] [DLAB-805]: replace model built with service --- .../computational/computational-resource-create-dialog/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts index 5de1037603..4586b9e264 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts @@ -24,6 +24,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../../shared/material.module'; import { FormControlsModule } from '../../../shared/form-controls'; import { ComputationalResourceCreateDialogComponent } from './computational-resource-create-dialog.component'; +import { ComputationalResourceModel } from './computational-resource-create.model'; import { KeysPipeModule, UnderscorelessPipeModule } from '../../../core/pipes'; @NgModule({ @@ -37,6 +38,7 @@ import { KeysPipeModule, UnderscorelessPipeModule } from '../../../core/pipes'; MaterialModule ], declarations: [ComputationalResourceCreateDialogComponent], + providers: [ComputationalResourceModel], entryComponents: [ComputationalResourceCreateDialogComponent], exports: [ComputationalResourceCreateDialogComponent] }) From 6c47e51765034751f8a561ffa37a2420cee3231b Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 18 Jun 2019 20:44:15 +0300 Subject: [PATCH 184/357] [DLAB-805]: preparation model cleanup --- .../computational-resource-create.model.ts | 206 ++++-------------- 1 file changed, 41 insertions(+), 165 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts index 5e7b45d561..cf642a474d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create.model.ts @@ -18,186 +18,62 @@ */ /* tslint:disable:no-empty */ +import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { UserResourceService } from '../../../core/services'; -import { ComputationalResourceImage, - ComputationalResourceApplicationTemplate, - ResourceShapeTypesModel } from '../../../core/models'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; -export class ComputationalResourceCreateModel { +@Injectable() +export class ComputationalResourceModel { - confirmAction: Function; - selectedItemChanged: Function; + constructor(private userResourceService: UserResourceService) { } - computational_resource_alias: string; - computational_resource_count: number; - computational_resource_instance_shape: string; - computational_resource_slave_shape: string; - notebook_name: string; - emr_slave_instance_spot: boolean; - emr_slave_instance_price: number; - preemptible_inst: number; - config: any; + public createComputationalResource(parameters, image, env, spot): Observable<{}> { + const config = parameters.configuration_parameters ? JSON.parse(parameters.configuration_parameters) : null; - selectedItem: ComputationalResourceApplicationTemplate = new ComputationalResourceApplicationTemplate({}, - new ResourceShapeTypesModel({}), '', '', ''); - selectedImage: ComputationalResourceImage; - resourceImages: Array = []; - templates: Array = []; - - availableTemplates: boolean = false; - private userResourceService: UserResourceService; - private continueWith: Function; - - static getDefault(userResourceService): ComputationalResourceCreateModel { - return new ComputationalResourceCreateModel('', 0, '', '', '', () => { }, () => { }, null, null, userResourceService); - } - - constructor( - computational_resource_alias: string, - computational_resource_count: number, - computational_resource_master_shape: string, - computational_resource_slave_shape: string, - notebook_name: string, - fnProcessResults: any, - fnProcessErrors: any, - selectedItemChanged: Function, - continueWith: Function, - userResourceService: UserResourceService - ) { - this.notebook_name = notebook_name; - this.userResourceService = userResourceService; - this.selectedItemChanged = selectedItemChanged; - this.continueWith = continueWith; - this.prepareModel(fnProcessResults, fnProcessErrors); - // this.loadTemplates(); - } - - public setSelectedItem(item: ComputationalResourceApplicationTemplate) { - this.selectedItem = item; - } - - public setCreatingParams( - name: string, - count: number, - instance_shape: string, - shape_slave: string, - spot: boolean, - price: number, - preemptible_inst?: number, - config?: any - ): void { - this.computational_resource_alias = name; - this.computational_resource_count = count; - this.computational_resource_instance_shape = instance_shape; - this.computational_resource_slave_shape = shape_slave; - this.emr_slave_instance_spot = spot; - this.emr_slave_instance_price = price; - this.preemptible_inst = preemptible_inst || 0; - this.config = config || null; - } - - public loadTemplates(): void { - if (this.resourceImages.length === 0) - this.userResourceService.getComputationalTemplates('project-2') - .subscribe( - data => { - let computationalResourceImage; - - this.availableTemplates = !!data.length; - - for (let parentIndex = 0; parentIndex < data.length; parentIndex++) { - computationalResourceImage = new ComputationalResourceImage(data[parentIndex]); - - if (DICTIONARY.cloud_provider !== 'azure') - this.resourceImages.push(computationalResourceImage); - } - - if (this.resourceImages.length > 0 && DICTIONARY.cloud_provider !== 'azure') { - this.setSelectedClusterType(0); - } else if (DICTIONARY.cloud_provider === 'azure') { - this.selectedItem = computationalResourceImage || {}; - this.selectedImage = computationalResourceImage || {}; - } - - if (this.continueWith) - this.continueWith(); - }); - } - - public setSelectedClusterType(index) { - this.selectedImage = this.resourceImages[index]; - this.templates = []; - - for (let index = 0; index < this.selectedImage.application_templates.length; index++) - this.templates.push(this.selectedImage.application_templates[index]); - - this.setSelectedTemplate(0); - } - - public setSelectedTemplate(index: number): void { - if (this.templates && this.templates[index]) { - this.selectedItem = this.templates[index]; - if (this.selectedItemChanged) - this.selectedItemChanged(); - } else { - this.selectedItem = null; - } - } - - public resetModel() { - this.setSelectedTemplate(0); - } - - private prepareModel(fnProcessResults: any, fnProcessErrors: any): void { - this.confirmAction = () => this.createComputationalResource() - .subscribe( - response => fnProcessResults(response), - error => fnProcessErrors(error) - ); - } - - private createComputationalResource(): Observable<{}> { - if (DICTIONARY.cloud_provider === 'aws' && this.selectedImage.image === 'docker.dlab-dataengine-service') { + debugger; + if (DICTIONARY.cloud_provider === 'aws' && image.image === 'docker.dlab-dataengine-service') { return this.userResourceService.createComputationalResource_DataengineService({ - name: this.computational_resource_alias, - emr_instance_count: this.computational_resource_count, - emr_master_instance_type: this.computational_resource_instance_shape, - emr_slave_instance_type: this.computational_resource_slave_shape, - emr_version: this.selectedItem.version, - notebook_name: this.notebook_name, - image: this.selectedItem.image, - template_name: this.selectedItem.template_name, - emr_slave_instance_spot: this.emr_slave_instance_spot, - emr_slave_instance_spot_pct_price: this.emr_slave_instance_price, - config: this.config + name: parameters.cluster_alias_name, + emr_instance_count: parameters.instance_number, + emr_master_instance_type: parameters.shape_master, + emr_slave_instance_type: parameters.shape_slave, + emr_version: parameters.version, + notebook_name: env.name, + image: image.image, + template_name: image.template_name, + emr_slave_instance_spot: spot, + emr_slave_instance_spot_pct_price: parameters.emr_slave_instance_price, + config: config, + project: env.project }); - } else if (DICTIONARY.cloud_provider === 'gcp' && this.selectedImage.image === 'docker.dlab-dataengine-service') { + } else if (DICTIONARY.cloud_provider === 'gcp' && image.image === 'docker.dlab-dataengine-service') { return this.userResourceService.createComputationalResource_DataengineService({ - name: this.computational_resource_alias, - template_name: this.selectedItem.template_name, - notebook_name: this.notebook_name, - image: this.selectedItem.image, - dataproc_master_instance_type: this.computational_resource_instance_shape, - dataproc_slave_instance_type: this.computational_resource_slave_shape, - dataproc_version: this.selectedItem.version, + name: parameters.cluster_alias_name, + dataproc_slave_count: (parameters.instance_number - 1), + template_name: image.template_name, + notebook_name: env.name, + image: image.image, + dataproc_master_instance_type: parameters.shape_master, + dataproc_slave_instance_type: parameters.shape_slave, + dataproc_version: image.version, dataproc_master_count: 1, - dataproc_slave_count: (this.computational_resource_count - 1), - dataproc_preemptible_count: this.preemptible_inst, - config: this.config + dataproc_preemptible_count: parameters.preemptible_instance_number, + config: config, + project: env.project }); } else { return this.userResourceService.createComputationalResource_Dataengine({ - name: this.computational_resource_alias, - dataengine_instance_count: this.computational_resource_count, - dataengine_instance_shape: this.computational_resource_instance_shape, - notebook_name: this.notebook_name, - image: this.selectedImage.image, - template_name: this.selectedImage.template_name, - config: this.config + name: parameters.cluster_alias_name, + dataengine_instance_count: parameters.instance_number, + dataengine_instance_shape: parameters.shape_master, + notebook_name: env.name, + image: image.image, + template_name: image.template_name, + config: config, + project: env.project }); } - }; + } } From b6606497ec0134d48d3ed28bb6ab64b8b78c3ca2 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 18 Jun 2019 20:45:11 +0300 Subject: [PATCH 185/357] [DLAB-805]: preparation model cleanup --- .../computational-resource-create-dialog.component.html | 4 ++-- .../computational-resource-create-dialog.component.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index 265688f0ff..dccd14e413 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -136,7 +136,7 @@

Add computational resources

- +
Select {{ DICTIONARY.notebook_instance_size }} @@ -222,7 +222,7 @@

Add computational resources

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss index 4ca29d0ed7..c40a7857c6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss @@ -36,7 +36,7 @@ position: absolute; padding-left: 5px; right: 0; - top: 40px; + top: 36px; } } .alias-name { From b99306e662ef35b0c58308eb75a437ce20fafe76 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 18 Jun 2019 20:46:32 +0300 Subject: [PATCH 186/357] [DLAB-805]: rebuild clusters creation dialog --- ...tional-resource-create-dialog.component.ts | 54 +++++++------------ 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts index 12c0abf9ce..4797a53374 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts @@ -17,12 +17,12 @@ * under the License. */ -import { Component, OnInit, EventEmitter, Output, ViewChild, ChangeDetectorRef, Inject } from '@angular/core'; +import { Component, OnInit, EventEmitter, Output, ViewChild, Inject } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; -import { ComputationalResourceCreateModel } from './computational-resource-create.model'; +import { ComputationalResourceModel } from './computational-resource-create.model'; import { UserResourceService } from '../../../core/services'; import { HTTP_STATUS_CODES, CheckUtils } from '../../../core/util'; @@ -41,7 +41,6 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { readonly CLUSTER_CONFIGURATION = CLUSTER_CONFIGURATION; readonly CheckUtils = CheckUtils; - // model: ComputationalResourceCreateModel; notebook_instance: any; full_list: any; @@ -64,7 +63,6 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { public resourceForm: FormGroup; @ViewChild('name') name; - // @ViewChild('clusterType') cluster_type; @ViewChild('templatesList') templates_list; @ViewChild('masterShapesList') master_shapes_list; @ViewChild('shapesSlaveList') slave_shapes_list; @@ -78,12 +76,10 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public data: any, public toastr: ToastrService, private userResourceService: UserResourceService, + private model: ComputationalResourceModel, private _fb: FormBuilder, - private ref: ChangeDetectorRef, public dialogRef: MatDialogRef, - ) { - // this.model = ComputationalResourceCreateModel.getDefault(userResourceService); - } + ) { } ngOnInit() { this.initFormModel(); @@ -92,11 +88,6 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { this.getTemplates(this.notebook_instance.project); } - - - - - // public onUpdate($event): void { // if ($event.model.type === 'template') { // this.model.setSelectedTemplate($event.model.index); @@ -124,21 +115,14 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { // } // } - public createComputationalResource(data, shape_master: string, shape_slave: string) { - // this.model.setCreatingParams( - // data.cluster_alias_name, - // data.instance_number, - // shape_master, shape_slave, - // this.spotInstance, - // data.instance_price, - // data.preemptible_instance_number, - // data.configuration_parameters ? JSON.parse(data.configuration_parameters) : null); - // this.model.confirmAction(); - // $event.preventDefault(); - - console.log(data); - - return false; + public createComputationalResource(data) { + this.model.createComputationalResource(data, this.selectedImage, this.notebook_instance, this.spotInstance) + .subscribe((response: any) => { + if (response.status === HTTP_STATUS_CODES.OK) { + this.dialogRef.close(); + this.buildGrid.emit(); + } + }); } public containsComputationalResource(conputational_resource_name: string): boolean { @@ -163,9 +147,9 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { if ($event ? $event.target.checked : this.spotInstancesSelect.nativeElement['checked']) { const filtered = this.filterAvailableSpots(); - this.slave_shapes_list.setDefaultOptions(filtered, this.shapePlaceholder(filtered, 'description'), - 'slave_shape', 'description', 'json'); - this.shapes.slave_shape = this.shapePlaceholder(filtered, 'type'); + // this.slave_shapes_list.setDefaultOptions(filtered, this.shapePlaceholder(filtered, 'description'), + // 'slave_shape', 'description', 'json'); + // this.shapes.slave_shape = this.shapePlaceholder(filtered, 'type'); this.spotInstance = this.shapePlaceholder(filtered, 'spot'); this.resourceForm.controls['instance_price'].setValue(50); @@ -196,8 +180,8 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { } private filterAvailableSpots() { - const filtered = JSON.parse(JSON.stringify(this.slave_shapes_list.items)); - for (const item in this.slave_shapes_list.items) { + const filtered = JSON.parse(JSON.stringify(this.selectedImage.computation_resources_shapes)); + for (const item in this.selectedImage.computation_resources_shapes) { filtered[item] = filtered[item].filter(el => el.spot); if (filtered[item].length <= 0) { delete filtered[item]; @@ -207,7 +191,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { } public isAvailableSpots(): boolean { - if (this.slave_shapes_list && this.slave_shapes_list.items) + if (DICTIONARY.cloud_provider === 'aws' && this.selectedImage.image === 'docker.dlab-dataengine-service') return !!Object.keys(this.filterAvailableSpots()).length; return false; @@ -225,7 +209,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { this.resourceForm = this._fb.group({ template_name: ['', [Validators.required]], version: [''], - shape_master: [''], + shape_master: ['', Validators.required], shape_slave: [''], cluster_alias_name: ['', [Validators.required, Validators.pattern(this.clusterNamePattern), this.providerMaxLength, this.checkDuplication.bind(this)]], From 62e2b23d8e5151e950f1ed14c69b74a5ab1972f5 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 19 Jun 2019 10:54:02 +0300 Subject: [PATCH 187/357] [DLAB-805]: clenup shapes Default Options settings --- ...putational-resource-create-dialog.component.html | 2 +- ...omputational-resource-create-dialog.component.ts | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index dccd14e413..db45e21bfe 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -181,7 +181,7 @@

Add computational resources

+ [hidden]="!selectedImage.templates.length">
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss index c63f0df94e..b78dca45f6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -19,26 +19,35 @@ table { width: 100%; + .name { width: 25%; } + .endpoints { width: 30%; + padding: 0 10px; } + .groups { width: 35%; + padding: 0 10px; } + .project-actions { color: #607d8b; width: 10%; text-align: center; + span { transition: all .5s ease-in-out; cursor: pointer; + .mat-icon { font-size: 18px; padding-top: 5px; } + &:hover { color: darken(#607d8b, 10%); } From a1a60ba99efe149a46a1dd49e2fbeda361f7b7ee Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 24 Jun 2019 14:30:21 +0300 Subject: [PATCH 208/357] proxy setting updated user key uploading updated --- .../src/base/scripts/install_user_key.py | 5 ++++- .../src/edge/templates/nginx.conf | 20 +++++++++---------- .../src/general/files/aws/project_Dockerfile | 1 + .../src/general/lib/os/debian/edge_lib.py | 2 +- .../src/general/scripts/aws/edge_configure.py | 7 ++++--- .../general/scripts/aws/project_prepare.py | 9 ++++----- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/infrastructure-provisioning/src/base/scripts/install_user_key.py b/infrastructure-provisioning/src/base/scripts/install_user_key.py index d026a0bf3c..14246cbd05 100644 --- a/infrastructure-provisioning/src/base/scripts/install_user_key.py +++ b/infrastructure-provisioning/src/base/scripts/install_user_key.py @@ -47,7 +47,10 @@ def copy_key(config): config.get('user_keydir'), config.get('user_keyname')) print(user_key) - key = open('{0}'.format(user_key)).read() + try: + key = config.get('user_key') + except KeyError: + key = open('{0}'.format(user_key)).read() sudo('echo "{0}" >> /home/{1}/.ssh/authorized_keys'.format(key, args.user)) except: print('No user key') diff --git a/infrastructure-provisioning/src/edge/templates/nginx.conf b/infrastructure-provisioning/src/edge/templates/nginx.conf index 6261f53d3c..d3d9d42a99 100644 --- a/infrastructure-provisioning/src/edge/templates/nginx.conf +++ b/infrastructure-provisioning/src/edge/templates/nginx.conf @@ -48,17 +48,17 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - auth_ldap_cache_enabled on; - auth_ldap_cache_expiration_time 10000; - auth_ldap_cache_size 1000; +# auth_ldap_cache_enabled on; +# auth_ldap_cache_expiration_time 10000; +# auth_ldap_cache_size 1000; - ldap_server ldap1 { - url ldap://LDAP_IP:389/LDAP_DN?uid,mail?sub?(&(objectClass=posixAccount)(uid=LDAP_USERNAME)); - binddn "LDAP_SERVICE_USERNAME,LDAP_DN"; - binddn_passwd "LDAP_SERVICE_PASSWORD"; - require valid_user; - request_timeout 30s; - } +# ldap_server ldap1 { +# url ldap://LDAP_IP:389/LDAP_DN?uid,mail?sub?(&(objectClass=posixAccount)(uid=LDAP_USERNAME)); +# binddn "LDAP_SERVICE_USERNAME,LDAP_DN"; +# binddn_passwd "LDAP_SERVICE_PASSWORD"; +# require valid_user; +# request_timeout 30s; +# } include /etc/nginx/conf.d/*.conf; } diff --git a/infrastructure-provisioning/src/general/files/aws/project_Dockerfile b/infrastructure-provisioning/src/general/files/aws/project_Dockerfile index 115eba8e01..4fa38da0f0 100644 --- a/infrastructure-provisioning/src/general/files/aws/project_Dockerfile +++ b/infrastructure-provisioning/src/general/files/aws/project_Dockerfile @@ -27,6 +27,7 @@ ARG OS COPY project/ /root/ COPY general/scripts/aws/project_* /root/scripts/ COPY general/scripts/aws/edge_* /root/scripts/ +COPY general/lib/os/${OS}/edge_lib.py /usr/lib/python2.7/dlab/edge_lib.py COPY general/templates/aws/edge_s3_policy.json /root/templates/edge_s3_policy.json RUN chmod a+x /root/fabfile.py; \ diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py index 6bae640e9b..a501e91d8a 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py @@ -36,7 +36,7 @@ def configure_http_proxy_server(config): put(template_file, '/tmp/squid.conf') sudo('\cp /tmp/squid.conf /etc/squid/squid.conf') sudo('sed -i "s|PROXY_SUBNET|{}|g" /etc/squid/squid.conf'.format(proxy_subnet)) - sudo('sed -i "s|EDGE_USER_NAME|{}|g" /etc/squid/squid.conf'.format(config['edge_user_name'])) +# sudo('sed -i "s|EDGE_USER_NAME|{}|g" /etc/squid/squid.conf'.format(config['edge_user_name'])) sudo('sed -i "s|LDAP_HOST|{}|g" /etc/squid/squid.conf'.format(config['ldap_host'])) sudo('sed -i "s|LDAP_DN|{}|g" /etc/squid/squid.conf'.format(config['ldap_dn'])) sudo('sed -i "s|LDAP_SERVICE_USERNAME|{}|g" /etc/squid/squid.conf'.format(config['ldap_user'])) diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index 431b99a063..abfc804a0d 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -39,7 +39,7 @@ edge_conf = dict() edge_conf['service_base_name'] = os.environ['conf_service_base_name'] edge_conf['key_name'] = os.environ['conf_key_name'] - edge_conf['user_keyname'] = os.environ['project_name'] + edge_conf['user_key'] = os.environ['key'] edge_conf['instance_name'] = '{}-{}-edge'.format(edge_conf['service_base_name'], os.environ['project_name']) edge_conf['tag_name'] = edge_conf['service_base_name'] + '-Tag' edge_conf['bucket_name'] = '{}-{}-bucket'.format(edge_conf['service_base_name'], @@ -167,8 +167,9 @@ try: print('[INSTALLING USERs KEY]') logging.info('[INSTALLING USERs KEY]') - additional_config = {"user_keyname": edge_conf['user_keyname'], - "user_keydir": os.environ['conf_key_dir']} + additional_config = {"user_keyname": os.environ['project_name'], + "user_keydir": os.environ['conf_key_dir'], + "user_key": edge_conf['user_key']} params = "--hostname {} --keyfile {} --additional_config '{}' --user {}".format( instance_hostname, keyfile_name, json.dumps(additional_config), edge_conf['dlab_ssh_user']) try: diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py index facb5df833..ae135a0868 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py @@ -44,7 +44,6 @@ project_conf['project_tag'] = os.environ['project_name'] project_conf['custom_tag'] = os.environ['project_tag'] project_conf['key_name'] = os.environ['conf_key_name'] - project_conf['user_keyname'] = os.environ['project_name'] project_conf['public_subnet_id'] = os.environ['aws_subnet_id'] project_conf['vpc_id'] = os.environ['aws_vpc_id'] project_conf['region'] = os.environ['aws_region'] @@ -104,10 +103,10 @@ os.environ['conf_user_subnets_range'] = '' # FUSE in case of absence of user's key - fname = "{}{}.pub".format(os.environ['conf_key_dir'], project_conf['user_keyname']) - print(fname) - if not os.path.isfile(fname): - print("ADMINSs PUBLIC KEY DOES NOT EXIST in {}".format(fname)) + try + project_conf['user_key'] = os.environ['key'] + except KeyError: + print("ADMINSs PUBLIC KEY DOES NOT UPLOADED") sys.exit(1) print("Will create exploratory environment with edge node as access point as following: {}". From 22583969384fe31db44f434b14a3753a91673b4f Mon Sep 17 00:00:00 2001 From: bhliva Date: Mon, 24 Jun 2019 15:17:07 +0300 Subject: [PATCH 209/357] DLAB-745, 746 introduced edge per project --- .../com/epam/dlab/dto/ProjectCreateDTO.java | 15 +++++ .../dto/base/project/CreateProjectResult.java | 15 +++++ .../dto/base/project/ProjectEdgeInfo.java | 28 +++++++++ .../ProvisioningServiceApplication.java | 1 + .../commands/CommandExecutorMockAsync.java | 4 +- .../handlers/ProjectCallbackHandler.java | 45 ++++++++++++++ .../modules/ProvisioningDevModule.java | 3 + .../backendapi/resources/ProjectResource.java | 31 ++++++++++ .../backendapi/service/ProjectService.java | 9 +++ .../service/impl/ProjectServiceImpl.java | 59 +++++++++++++++++++ .../mock_response/gcp/project_create.json | 56 ++++++++++++++++++ .../backendapi/SelfServiceApplication.java | 4 +- .../epam/dlab/backendapi/dao/ProjectDAO.java | 5 ++ .../dlab/backendapi/dao/ProjectDAOImpl.java | 21 +++++++ .../dlab/backendapi/domain/ProjectDTO.java | 10 ++++ .../backendapi/resources/ProjectResource.java | 5 +- .../resources/callback/ProjectCallback.java | 46 +++++++++++++++ .../backendapi/service/ProjectService.java | 2 +- .../service/impl/ProjectServiceImpl.java | 34 ++++++++++- ...InfrastructureTemplateServiceBaseTest.java | 6 +- 20 files changed, 388 insertions(+), 11 deletions(-) create mode 100644 services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java create mode 100644 services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java create mode 100644 services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java create mode 100644 services/provisioning-service/src/main/resources/mock_response/gcp/project_create.json create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java new file mode 100644 index 0000000000..a5ec69345b --- /dev/null +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java @@ -0,0 +1,15 @@ +package com.epam.dlab.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +public class ProjectCreateDTO extends ResourceBaseDTO { + private final String key; + @JsonProperty("project_name") + private final String name; + @JsonProperty("project_tag") + private final String tag; +} diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java new file mode 100644 index 0000000000..3059b0ef45 --- /dev/null +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java @@ -0,0 +1,15 @@ +package com.epam.dlab.dto.base.project; + +import com.epam.dlab.dto.StatusBaseDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class CreateProjectResult extends StatusBaseDTO { + private ProjectEdgeInfo edgeInfo; + @JsonProperty("project_name") + private String projectName; + +} diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java new file mode 100644 index 0000000000..0bf1c20bc5 --- /dev/null +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java @@ -0,0 +1,28 @@ +package com.epam.dlab.dto.base.project; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class ProjectEdgeInfo { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private String id; + + @JsonProperty("instance_id") + private String instanceId; + + @JsonProperty + private String hostname; + + @JsonProperty("public_ip") + private String publicIp; + + @JsonProperty + private String ip; + + @JsonProperty("key_name") + private String keyName; +} diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/ProvisioningServiceApplication.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/ProvisioningServiceApplication.java index 4f063c691d..2353f2d857 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/ProvisioningServiceApplication.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/ProvisioningServiceApplication.java @@ -102,6 +102,7 @@ public void run(ProvisioningServiceApplicationConfiguration configuration, Envir jersey.register(injector.getInstance(BackupResource.class)); jersey.register(injector.getInstance(KeyResource.class)); jersey.register(injector.getInstance(CallbackHandlerResource.class)); + jersey.register(injector.getInstance(ProjectResource.class)); } } diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandExecutorMockAsync.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandExecutorMockAsync.java index 5af48e3c2d..7277961cd4 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandExecutorMockAsync.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandExecutorMockAsync.java @@ -294,8 +294,8 @@ private void describe() { private void action(String user, DockerAction action) { String resourceType = parser.getResourceType(); - String prefixFileName = (Lists.newArrayList("edge", "dataengine", "dataengine-service").contains - (resourceType) ? resourceType : "notebook") + "_"; + String prefixFileName = (Lists.newArrayList("project", "edge", "dataengine", "dataengine-service") + .contains(resourceType) ? resourceType : "notebook") + "_"; String templateFileName = "mock_response/" + cloudProvider.getName() + '/' + prefixFileName + action.toString() + JSON_FILE_ENDING; responseFileName = getAbsolutePath(parser.getResponsePath(), prefixFileName + user + "_" + diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java new file mode 100644 index 0000000000..6f7f9eb3c5 --- /dev/null +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java @@ -0,0 +1,45 @@ +package com.epam.dlab.backendapi.core.response.handlers; + +import com.epam.dlab.auth.SystemUserInfoService; +import com.epam.dlab.backendapi.core.commands.DockerAction; +import com.epam.dlab.dto.UserInstanceStatus; +import com.epam.dlab.dto.base.project.CreateProjectResult; +import com.epam.dlab.dto.base.project.ProjectEdgeInfo; +import com.epam.dlab.exceptions.DlabException; +import com.epam.dlab.rest.client.RESTService; +import com.fasterxml.jackson.databind.JsonNode; + +import java.io.IOException; + +public class ProjectCallbackHandler extends ResourceCallbackHandler { + + + private final String callbackUri; + + public ProjectCallbackHandler(SystemUserInfoService systemUserInfoService, RESTService selfService, String user, + String uuid, DockerAction action, String callbackUri) { + super(systemUserInfoService, selfService, user, uuid, action); + this.callbackUri = callbackUri; + } + + @Override + protected String getCallbackURI() { + return callbackUri; + } + + @Override + protected CreateProjectResult parseOutResponse(JsonNode resultNode, CreateProjectResult baseStatus) { + if (resultNode != null && getAction() == DockerAction.CREATE + && UserInstanceStatus.of(baseStatus.getStatus()) != UserInstanceStatus.FAILED) { + try { + final ProjectEdgeInfo projectEdgeInfo = mapper.readValue(resultNode.toString(), ProjectEdgeInfo.class); + baseStatus.setEdgeInfo(projectEdgeInfo); + baseStatus.setProjectName(resultNode.get("project_name").asText()); + } catch (IOException e) { + throw new DlabException("Cannot parse the EDGE info in JSON: " + e.getLocalizedMessage(), e); + } + } + + return baseStatus; + } +} diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProvisioningDevModule.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProvisioningDevModule.java index 3ec10350dc..9817a65566 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProvisioningDevModule.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProvisioningDevModule.java @@ -31,9 +31,11 @@ import com.epam.dlab.backendapi.core.commands.ICommandExecutor; import com.epam.dlab.backendapi.core.response.handlers.dao.CallbackHandlerDao; import com.epam.dlab.backendapi.core.response.handlers.dao.FileSystemCallbackHandlerDao; +import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.backendapi.service.RestoreCallbackHandlerService; import com.epam.dlab.backendapi.service.CheckInactivityService; import com.epam.dlab.backendapi.service.impl.CheckInactivityServiceImpl; +import com.epam.dlab.backendapi.service.impl.ProjectServiceImpl; import com.epam.dlab.backendapi.service.impl.RestoreCallbackHandlerServiceImpl; import com.epam.dlab.constants.ServiceConsts; import com.epam.dlab.mongo.MongoService; @@ -91,6 +93,7 @@ public UserInfo create(String name) { bind(CallbackHandlerDao.class).to(FileSystemCallbackHandlerDao.class); bind(RestoreCallbackHandlerService.class).to(RestoreCallbackHandlerServiceImpl.class); bind(CheckInactivityService.class).to(CheckInactivityServiceImpl.class); + bind(ProjectService.class).to(ProjectServiceImpl.class); } /** diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java new file mode 100644 index 0000000000..6bb8826ddd --- /dev/null +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -0,0 +1,31 @@ +package com.epam.dlab.backendapi.resources; + +import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.dto.ProjectCreateDTO; +import com.google.inject.Inject; +import io.dropwizard.auth.Auth; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +@Path("infrastructure/project") +public class ProjectResource { + private final ProjectService projectService; + + @Inject + public ProjectResource(ProjectService projectService) { + this.projectService = projectService; + } + + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public Response createProject(@Auth UserInfo userInfo, ProjectCreateDTO dto) { + return Response.ok(projectService.create(userInfo, dto)).build(); + } +} diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java new file mode 100644 index 0000000000..60656f4919 --- /dev/null +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -0,0 +1,9 @@ +package com.epam.dlab.backendapi.service; + +import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.dto.ProjectCreateDTO; + +public interface ProjectService { + + String create(UserInfo userInfo, ProjectCreateDTO projectCreateDTO); +} diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java new file mode 100644 index 0000000000..dc6401aaa8 --- /dev/null +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -0,0 +1,59 @@ +package com.epam.dlab.backendapi.service.impl; + +import com.epam.dlab.auth.SystemUserInfoService; +import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.ProvisioningServiceApplicationConfiguration; +import com.epam.dlab.backendapi.core.commands.*; +import com.epam.dlab.backendapi.core.response.folderlistener.FolderListenerExecutor; +import com.epam.dlab.backendapi.core.response.handlers.ProjectCallbackHandler; +import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.dto.ProjectCreateDTO; +import com.epam.dlab.rest.client.RESTService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.google.inject.Inject; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class ProjectServiceImpl implements ProjectService { + @Inject + protected RESTService selfService; + @Inject + protected SystemUserInfoService systemUserInfoService; + @Inject + private ProvisioningServiceApplicationConfiguration configuration; + @Inject + private FolderListenerExecutor folderListenerExecutor; + @Inject + private ICommandExecutor commandExecutor; + @Inject + private CommandBuilder commandBuilder; + + @Override + public String create(UserInfo userInfo, ProjectCreateDTO dto) { + String uuid = DockerCommands.generateUUID(); + + folderListenerExecutor.start(configuration.getKeyLoaderDirectory(), + configuration.getKeyLoaderPollTimeout(), + new ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getName(), uuid, + DockerAction.CREATE, "/api/project/status")); + + RunDockerCommand runDockerCommand = new RunDockerCommand() + .withInteractive() + .withName(String.join("_", dto.getName(), "project")) + .withVolumeForRootKeys(configuration.getKeyDirectory()) + .withVolumeForResponse(configuration.getKeyLoaderDirectory()) + .withVolumeForLog(configuration.getDockerLogDirectory(), "project") + .withResource("project") + .withRequestId(uuid) + .withConfKeyName(configuration.getAdminKey()) + .withImage("docker.dlab-project") + .withAction(DockerAction.CREATE); + + try { + commandExecutor.executeAsync(userInfo.getName(), uuid, commandBuilder.buildCommand(runDockerCommand, dto)); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + return uuid; + } +} diff --git a/services/provisioning-service/src/main/resources/mock_response/gcp/project_create.json b/services/provisioning-service/src/main/resources/mock_response/gcp/project_create.json new file mode 100644 index 0000000000..9f59b6d860 --- /dev/null +++ b/services/provisioning-service/src/main/resources/mock_response/gcp/project_create.json @@ -0,0 +1,56 @@ +{ + "status": "ok", + "response": { + "result": { + "tunnel_port": "22", + "full_edge_conf": { + "edge_service_account_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge", + "fw_edge_egress_internal": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-egress-internal", + "dlab_ssh_user": "dlab-user", + "ps_role_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps", + "fw_ps_egress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-egress-public", + "private_ip": "10.10.0.3", + "fw_ps_ingress": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-ingress", + "ssh_key_path": "/root/keys/BDCC-DSS-POC.pem", + "zone": "us-west1-a ", + "fw_edge_egress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-egress-public", + "ami_name": "/projects/ubuntu-os-cloud/global/images/ubuntu-1604-xenial-v20170721", + "edge_role_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge", + "private_subnet_prefix": "24", + "subnet_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-subnet", + "vpc_cidr": "10.10.0.0/16", + "key_name": "${CONF_KEY_NAME}", + "service_base_name": "${CONF_SERVICE_BASE_NAME}", + "static_address_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ip", + "fw_ps_egress_private": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-egress-private", + "vpc_name": "${CONF_SERVICE_BASE_NAME}-ssn-vpc", + "static_ip": "104.198.5.3", + "bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", + "fw_edge_ingress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-ingress-public", + "ps_service_account_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps", + "firewall_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-firewall", + "region": "us-west1", + "fw_common_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps", + "instance_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge", + "user_keyname": "${EDGE_USER_NAME}", + "edge_user_name": "${EDGE_USER_NAME}", + "private_subnet_cidr": "10.10.16.0/24", + "fw_edge_ingress_internal": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-ingress-internal", + "vpc_selflink": "https://www.googleapis.com/compute/v1/projects/or2-msq-epmc-dlab-t1iylu/global/networks/${CONF_SERVICE_BASE_NAME}-ssn-vpc", + "instance_size": "n1-standard-1", + "notebook_firewall_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-firewall" + }, + "key_name": "BDCC-DSS-POC", + "hostname": "104.198.5.3", + "public_ip": "104.198.5.3", + "ip": "10.10.0.3", + "Action": "Create new EDGE server", + "user_own_bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", + "socks_port": "1080", + "notebook_subnet": "10.10.16.0/24", + "project_name" : "${PROJECT_NAME}" + }, + "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log" + }, + "request_id": "${REQUEST_ID}" +} \ No newline at end of file diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java index 8271fb2a37..8cc143e7a1 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java @@ -100,7 +100,8 @@ public void initialize(Bootstrap bootstrap) /*bootstrap.addBundle(new SwaggerBundle() { @Override - protected SwaggerBundleConfiguration getSwaggerBundleConfiguration(SelfServiceApplicationConfiguration configuration) { + protected SwaggerBundleConfiguration getSwaggerBundleConfiguration(SelfServiceApplicationConfiguration + configuration) { return configuration.getSwaggerConfiguration(); } });*/ @@ -181,6 +182,7 @@ public void run(SelfServiceApplicationConfiguration configuration, Environment e jersey.register(injector.getInstance(ApplicationSettingResource.class)); jersey.register(injector.getInstance(EndpointResource.class)); jersey.register(injector.getInstance(ProjectResource.class)); + jersey.register(injector.getInstance(ProjectCallback.class)); OpenAPI oas = new OpenAPI(); Info info = new Info() .title("Hello World API") diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index 9939bc56c4..35cfd1b6e7 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -1,6 +1,7 @@ package com.epam.dlab.backendapi.dao; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.dto.base.project.ProjectEdgeInfo; import java.util.List; import java.util.Optional; @@ -11,6 +12,10 @@ public interface ProjectDAO { void create(ProjectDTO projectDTO); + void updateStatus(String projectName, ProjectDTO.Status status); + + void updateEdgeInfoAndStatus(String projectName, ProjectEdgeInfo edgeInfo, ProjectDTO.Status status); + Optional get(String name); boolean update(ProjectDTO projectDTO); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index 3fd5e6b438..c3a6752875 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -1,7 +1,10 @@ package com.epam.dlab.backendapi.dao; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.dto.base.project.ProjectEdgeInfo; import com.google.common.collect.Iterables; +import com.mongodb.BasicDBObject; +import com.mongodb.client.result.UpdateResult; import org.bson.Document; import org.bson.conversions.Bson; @@ -16,6 +19,8 @@ public class ProjectDAOImpl extends BaseDAO implements ProjectDAO { private static final String PROJECTS_COLLECTION = "Projects"; private static final String GROUPS = "groups"; + private static final String STATUS_FIELD = "status"; + private static final String EDGE_INFO_FIELD = "edgeInfo"; @Override public List getProjects() { @@ -27,6 +32,22 @@ public void create(ProjectDTO projectDTO) { insertOne(PROJECTS_COLLECTION, projectDTO); } + @Override + public void updateStatus(String projectName, ProjectDTO.Status status) { + updateOne(PROJECTS_COLLECTION, projectCondition(projectName), + new Document(SET, new Document(STATUS_FIELD, status.toString()))); + } + + @Override + public void updateEdgeInfoAndStatus(String projectName, ProjectEdgeInfo edgeInfo, ProjectDTO.Status status) { + BasicDBObject dbObject = new BasicDBObject(); + dbObject.put(STATUS_FIELD, status.toString()); + dbObject.put(EDGE_INFO_FIELD, convertToBson(edgeInfo)); + final UpdateResult updateResult = updateOne(PROJECTS_COLLECTION, projectCondition(projectName), + new Document(SET, dbObject)); + System.out.println(updateResult); + } + @Override public Optional get(String name) { return findOne(PROJECTS_COLLECTION, projectCondition(name), ProjectDTO.class); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 07b281fc42..ac47bd86e1 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -16,6 +16,16 @@ public class ProjectDTO { @NotNull private final Set groups; @NotNull + private final String key; + @NotNull private final String tag; private final Integer budget; + private final Status status = Status.CREATING; + + + public enum Status { + CREATING, + CREATED, + FAILED + } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java index 85029ddd93..36d078ca12 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -16,6 +16,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import javax.annotation.security.RolesAllowed; +import javax.validation.Valid; import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; @@ -51,8 +52,8 @@ public ProjectResource(ProjectService projectService) { }) @POST @Consumes(MediaType.APPLICATION_JSON) - public Response createProject(@Parameter(hidden = true) @Auth UserInfo userInfo, ProjectDTO projectDTO) { - projectService.create(projectDTO); + public Response createProject(@Parameter(hidden = true) @Auth UserInfo userInfo, @Valid ProjectDTO projectDTO) { + projectService.create(userInfo, projectDTO); final URI uri = uriInfo.getRequestUriBuilder().path(projectDTO.getName()).build(); return Response .ok() diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java new file mode 100644 index 0000000000..9807119585 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java @@ -0,0 +1,46 @@ +package com.epam.dlab.backendapi.resources.callback; + +import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.dao.ProjectDAO; +import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.domain.RequestId; +import com.epam.dlab.dto.UserInstanceStatus; +import com.epam.dlab.dto.base.project.CreateProjectResult; +import com.google.inject.Inject; +import io.dropwizard.auth.Auth; +import lombok.extern.slf4j.Slf4j; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +@Path("/project/status") +@Consumes(MediaType.APPLICATION_JSON) +@Slf4j +public class ProjectCallback { + + private final ProjectDAO projectDAO; + private final RequestId requestId; + + @Inject + public ProjectCallback(ProjectDAO projectDAO, RequestId requestId) { + this.projectDAO = projectDAO; + this.requestId = requestId; + } + + + @POST + public Response updateProjectStatus(@Auth UserInfo userInfo, CreateProjectResult projectResult) { + requestId.checkAndRemove(projectResult.getRequestId()); + if (UserInstanceStatus.of(projectResult.getStatus()) == UserInstanceStatus.FAILED) { + projectDAO.updateStatus(projectResult.getProjectName(), ProjectDTO.Status.FAILED); + } else { + projectDAO.updateEdgeInfoAndStatus(projectResult.getProjectName(), projectResult.getEdgeInfo(), + ProjectDTO.Status.CREATED); + } + return Response.ok().build(); + } +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index bde43b2a1d..03c979c0e7 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -8,7 +8,7 @@ public interface ProjectService { List getProjects(); - void create(ProjectDTO projectDTO); + void create(UserInfo userInfo, ProjectDTO projectDTO); ProjectDTO get(String name); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index d118844f9c..0343583f04 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -4,11 +4,17 @@ import com.epam.dlab.backendapi.dao.ProjectDAO; import com.epam.dlab.backendapi.dao.UserGroupDao; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.domain.RequestId; import com.epam.dlab.backendapi.service.EnvironmentService; import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.constants.ServiceConsts; +import com.epam.dlab.dto.ProjectCreateDTO; import com.epam.dlab.exceptions.ResourceConflictException; import com.epam.dlab.exceptions.ResourceNotFoundException; +import com.epam.dlab.rest.client.RESTService; import com.google.inject.Inject; +import com.google.inject.name.Named; +import lombok.extern.slf4j.Slf4j; import java.util.List; import java.util.Set; @@ -17,18 +23,26 @@ import static java.util.stream.Collectors.toSet; import static java.util.stream.Stream.concat; +@Slf4j public class ProjectServiceImpl implements ProjectService { + private static final String CREATE_PRJ_API = "infrastructure/project"; private final ProjectDAO projectDAO; private final EnvironmentService environmentService; private final UserGroupDao userGroupDao; + private final RESTService provisioningService; + private final RequestId requestId; @Inject public ProjectServiceImpl(ProjectDAO projectDAO, EnvironmentService environmentService, - UserGroupDao userGroupDao) { + UserGroupDao userGroupDao, + @Named(ServiceConsts.PROVISIONING_SERVICE_NAME) RESTService provisioningService, + RequestId requestId) { this.projectDAO = projectDAO; this.environmentService = environmentService; this.userGroupDao = userGroupDao; + this.provisioningService = provisioningService; + this.requestId = requestId; } @Override @@ -37,9 +51,10 @@ public List getProjects() { } @Override - public void create(ProjectDTO projectDTO) { + public void create(UserInfo user, ProjectDTO projectDTO) { if (!projectDAO.get(projectDTO.getName()).isPresent()) { projectDAO.create(projectDTO); + createProjectOnCloud(user, projectDTO); } else { throw new ResourceConflictException("Project with passed name already exist in system"); } @@ -77,6 +92,21 @@ public boolean isAnyProjectAssigned(UserInfo userInfo) { return projectDAO.isAnyProjectAssigned(userGroups); } + private void createProjectOnCloud(UserInfo user, ProjectDTO projectDTO) { + try { + final ProjectCreateDTO projectDto = ProjectCreateDTO.builder() + .key(projectDTO.getKey()) + .name(projectDTO.getName()) + .tag(projectDTO.getTag()) + .build(); + String uuid = provisioningService.post(CREATE_PRJ_API, user.getAccessToken(), projectDto, String.class); + requestId.put(user.getName(), uuid); + } catch (Exception e) { + log.error("Can not create project due to: {}", e.getMessage()); + projectDAO.updateStatus(projectDTO.getName(), ProjectDTO.Status.FAILED); + } + } + private Supplier projectNotFound() { return () -> new ResourceNotFoundException("Project with passed name not found"); } diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java index b2979fa975..834f2f1d02 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java @@ -77,7 +77,7 @@ public void getExploratoryTemplates() { emDto2.setExploratoryEnvironmentShapes(shapes2); List expectedEmdDtoList = Arrays.asList(emDto1, emDto2); when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), - Collections.singleton("project"), null, null))); + Collections.singleton("project"), null, null, null))); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedEmdDtoList.toArray()); when(settingsDAO.getConfOsFamily()).thenReturn("someConfOsFamily"); @@ -116,7 +116,7 @@ public void getComputationalTemplates() throws NoSuchFieldException, IllegalAcce computationalMetadataDTO ); when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), - Collections.singleton("project"), null, null))); + Collections.singleton("project"), null, null, null))); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedCmdDtoList.toArray(new ComputationalMetadataDTO[]{})); List expectedFullCmdDtoList = expectedCmdDtoList.stream() @@ -158,7 +158,7 @@ public void getComputationalTemplatesWithInapproprietaryImageName() { List expectedCmdDtoList = Collections.singletonList(computationalMetadataDTO); when(provisioningService.get(anyString(), anyString(), any())).thenReturn(expectedCmdDtoList.toArray(new ComputationalMetadataDTO[]{})); when(projectDAO.get(anyString())).thenReturn(Optional.of(new ProjectDTO("project", Collections.emptySet(), - Collections.singleton("project"), null, null))); + Collections.singleton("project"), null, null,null))); UserInfo userInfo = new UserInfo("test", "token"); try { From 90fc21137ab9cf4cb6f85fd86cab3c8648f6585e Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 24 Jun 2019 16:58:58 +0300 Subject: [PATCH 210/357] project terminate updated --- .../src/general/api/terminate.py | 4 +- .../src/general/scripts/aws/edge_configure.py | 6 +- .../general/scripts/aws/project_terminate.py | 10 +- .../src/project/fabfile.py | 6 +- .../project/scripts/configure_http_proxy.py | 52 +++++ .../scripts/configure_nginx_reverse_proxy.py | 64 ++++++ .../src/project/scripts/reupload_ssh_key.py | 71 ++++++ .../src/project/templates/conf.d/proxy.conf | 28 +++ .../locations/dataengine-service.conf | 77 +++++++ .../project/templates/locations/jupyter.conf | 29 +++ .../project/templates/locations/rstudio.conf | 30 +++ .../project/templates/locations/spark.conf | 123 ++++++++++ .../project/templates/locations/tensor.conf | 31 +++ .../project/templates/locations/ungit.conf | 29 +++ .../project/templates/locations/zeppelin.conf | 28 +++ .../src/project/templates/nginx.conf | 64 ++++++ .../src/project/templates/nginx_debian | 216 ++++++++++++++++++ .../src/project/templates/nginx_redhat | 128 +++++++++++ .../src/project/templates/squid.conf | 62 +++++ 19 files changed, 1048 insertions(+), 10 deletions(-) create mode 100644 infrastructure-provisioning/src/project/scripts/configure_http_proxy.py create mode 100644 infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py create mode 100644 infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py create mode 100644 infrastructure-provisioning/src/project/templates/conf.d/proxy.conf create mode 100644 infrastructure-provisioning/src/project/templates/locations/dataengine-service.conf create mode 100644 infrastructure-provisioning/src/project/templates/locations/jupyter.conf create mode 100644 infrastructure-provisioning/src/project/templates/locations/rstudio.conf create mode 100644 infrastructure-provisioning/src/project/templates/locations/spark.conf create mode 100644 infrastructure-provisioning/src/project/templates/locations/tensor.conf create mode 100644 infrastructure-provisioning/src/project/templates/locations/ungit.conf create mode 100644 infrastructure-provisioning/src/project/templates/locations/zeppelin.conf create mode 100644 infrastructure-provisioning/src/project/templates/nginx.conf create mode 100644 infrastructure-provisioning/src/project/templates/nginx_debian create mode 100644 infrastructure-provisioning/src/project/templates/nginx_redhat create mode 100644 infrastructure-provisioning/src/project/templates/squid.conf diff --git a/infrastructure-provisioning/src/general/api/terminate.py b/infrastructure-provisioning/src/general/api/terminate.py index 783e366fbd..933af2780d 100644 --- a/infrastructure-provisioning/src/general/api/terminate.py +++ b/infrastructure-provisioning/src/general/api/terminate.py @@ -56,10 +56,10 @@ response_file.write(json.dumps(reply)) else: reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index abfc804a0d..f2970dd18d 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -69,7 +69,11 @@ 'Private') edge_conf['edge_public_ip'] = edge_conf['edge_private_ip'] edge_conf['vpc1_cidrs'] = get_vpc_cidr_by_id(os.environ['aws_vpc_id']) - edge_conf['vpc2_cidrs'] = get_vpc_cidr_by_id(os.environ['aws_notebook_vpc_id']) + try: + edge_conf['vpc2_cidrs'] = get_vpc_cidr_by_id(os.environ['aws_notebook_vpc_id']) + edge_conf['vpc_cidrs'] = list(set(edge_conf['vpc1_cidrs'] + edge_conf['vpc2_cidrs'])) + except KeyError: + edge_conf['vpc_cidrs'] = list(set(edge_conf['vpc1_cidrs'])) edge_conf['vpc_cidrs'] = list(set(edge_conf['vpc1_cidrs'] + edge_conf['vpc2_cidrs'])) edge_conf['allowed_ip_cidr'] = list() for cidr in os.environ['conf_allowed_ip_cidr'].split(','): diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py index 743a8d1cd3..369a475a91 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py @@ -97,12 +97,12 @@ def terminate_edge_node(tag_name, user_name, tag_value, nb_sg, edge_sg, de_sg, e project_conf['project_tag'] = os.environ['project_name'] project_conf['tag_name'] = project_conf['service_base_name'] + '-Tag' project_conf['tag_value'] = project_conf['service_base_name'] + "-" + os.environ['project_name'] + '-*' - project_conf['edge_sg'] = edge_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge' - project_conf['nb_sg'] = edge_conf['service_base_name'] + "-" + os.environ['project_name'] + '-nb' - project_conf['edge_instance_name'] = edge_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge' - project_conf['de_sg'] = edge_conf['service_base_name'] + "-" + project_conf['project_tag'] + \ + project_conf['edge_sg'] = project_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge' + project_conf['nb_sg'] = project_conf['service_base_name'] + "-" + os.environ['project_name'] + '-nb' + project_conf['edge_instance_name'] = project_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge' + project_conf['de_sg'] = project_conf['service_base_name'] + "-" + project_conf['project_tag'] + \ '-dataengine*' - project_conf['emr_sg'] = edge_conf['service_base_name'] + "-" + project_conf['project_tag'] + '-des-*' + project_conf['emr_sg'] = project_conf['service_base_name'] + "-" + project_conf['project_tag'] + '-des-*' try: logging.info('[TERMINATE PROJECT]') diff --git a/infrastructure-provisioning/src/project/fabfile.py b/infrastructure-provisioning/src/project/fabfile.py index 2bacaa8f4b..59494695ed 100644 --- a/infrastructure-provisioning/src/project/fabfile.py +++ b/infrastructure-provisioning/src/project/fabfile.py @@ -31,7 +31,8 @@ def run(): - local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], + os.environ['request_id']) local_log_filepath = "/logs/project/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -60,7 +61,8 @@ def run(): # Main function for terminating EDGE node and exploratory environment if exists def terminate(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], + os.environ['request_id']) local_log_filepath = "/logs/project/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, diff --git a/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py new file mode 100644 index 0000000000..bad50ad1f5 --- /dev/null +++ b/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py @@ -0,0 +1,52 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +from fabric.api import * +from fabric.contrib.files import exists +from dlab.edge_lib import configure_http_proxy_server +import argparse +import json +import sys + +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('--additional_config', type=str, default='{"empty":"string"}') +args = parser.parse_args() + +############## +# Run script # +############## +if __name__ == "__main__": + print("Configure connections") + try: + env['connection_attempts'] = 100 + env.key_filename = [args.keyfile] + env.host_string = '{}@{}'.format(args.user, args.hostname) + deeper_config = json.loads(args.additional_config) + except: + sys.exit(2) + + print("Installing proxy for notebooks.") + configure_http_proxy_server(deeper_config) diff --git a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py new file mode 100644 index 0000000000..6b2ee34794 --- /dev/null +++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py @@ -0,0 +1,64 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +import logging +from fabric.api import * +import argparse +import sys +import os +from dlab.edge_lib import install_nginx_ldap + +parser = argparse.ArgumentParser() +parser.add_argument('--hostname', type=str, default='') +parser.add_argument('--keyfile', type=str, default='') +parser.add_argument('--user', type=str, default='') +args = parser.parse_args() + +if __name__ == "__main__": + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], + os.environ['project_name'], + os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + print("Configure connections") + try: + env['connection_attempts'] = 100 + env.key_filename = [args.keyfile] + env.host_string = '{}@{}'.format(args.user, args.hostname) + except Exception as err: + print("Failed establish connection. Excpeption: " + 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'], os.environ['{}_iam_user'.format( +# os.environ['conf_cloud_provider'])]) +# except Exception as err: +# print("Failed install nginx reverse proxy: " + str(err)) +# sys.exit(1) + diff --git a/infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py b/infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py new file mode 100644 index 0000000000..b853af5955 --- /dev/null +++ b/infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py @@ -0,0 +1,71 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +import os +import sys +import logging +import traceback +from dlab.fab import * +from dlab.meta_lib import * +from dlab.actions_lib import * +from fabric.api import * +import multiprocessing + +if __name__ == "__main__": + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + try: + if os.environ['conf_cloud_provider'] == 'aws': + create_aws_config_files() + logging.info('[REUPLOADING USER SSH KEY]') + print('[REUPLOADING USER SSH KEY]') + reupload_config = dict() + reupload_config['os_user'] = os.environ['conf_os_user'] + reupload_config['edge_user_name'] = os.environ['edge_user_name'] + reupload_config['keyfile'] = '{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) + reupload_config['resource_id'] = os.environ['resource_id'] + reupload_config['additional_config'] = {"user_keyname": reupload_config['edge_user_name'], + "user_keydir": os.environ['conf_key_dir']} + print(reupload_config) + try: + params = "--conf_resource {} --instance_id {} --os_user '{}'" \ + " --keyfile '{}' --additional_config '{}'".format( + os.environ['conf_resource'], reupload_config['resource_id'], + reupload_config['os_user'], reupload_config['keyfile'], + json.dumps(reupload_config['additional_config'])) + local("~/scripts/{}.py {}".format('common_reupload_key', params)) + except Exception as err: + traceback.print_exc() + raise Exception + except Exception as err: + append_result("Failed to reupload user ssh key.", str(err)) + sys.exit(1) + + with open("/root/result.json", 'w') as result: + res = {"Action": "Reupload user ssh key"} + result.write(json.dumps(res)) \ No newline at end of file diff --git a/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf b/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf new file mode 100644 index 0000000000..3c4602977e --- /dev/null +++ b/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf @@ -0,0 +1,28 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +server { + listen 80; + server_name EDGE_IP; + auth_ldap "Forbidden"; + auth_ldap_servers ldap1; + + include locations/*.conf; +} diff --git a/infrastructure-provisioning/src/project/templates/locations/dataengine-service.conf b/infrastructure-provisioning/src/project/templates/locations/dataengine-service.conf new file mode 100644 index 0000000000..56f1a2957c --- /dev/null +++ b/infrastructure-provisioning/src/project/templates/locations/dataengine-service.conf @@ -0,0 +1,77 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +location /{{ CLUSTER_NAME }}/ { + rewrite ^/{{ CLUSTER_NAME }}/{{ CLUSTER_NAME }}/(.*)$ /$1 break; + rewrite ^/{{ CLUSTER_NAME }}/(.*)$ /$1 break; + proxy_pass http://{{ MASTER_IP }}:8088; + proxy_redirect http://{{ MASTER_IP }}:8088/ $scheme://$host/{{ CLUSTER_NAME }}/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter_types *; + sub_filter_once off; + sub_filter '/static/' '/{{ CLUSTER_NAME }}/static/'; + sub_filter '/cluster/' '/{{ CLUSTER_NAME }}/cluster/'; + sub_filter '/conf' '/{{ CLUSTER_NAME }}/conf'; + sub_filter '/logs' '/{{ CLUSTER_NAME }}/logs'; + sub_filter '/stacks' '/{{ CLUSTER_NAME }}/stacks'; + sub_filter '/jmx' '/{{ CLUSTER_NAME }}/jmx'; + sub_filter '//{{ MASTER_DNS }}:20888' '//$host/{{ CLUSTER_NAME }}-application'; + sub_filter '//{{ MASTER_DNS }}:8088' '//$host/{{ CLUSTER_NAME }}'; + {% for item in slaves %} + sub_filter '//{{ item.dns }}:8042' '//$host/{{ CLUSTER_NAME }}-{{ item.name }}'; + {% endfor %} +} + +location /{{ CLUSTER_NAME }}-application/ { + rewrite ^/{{ CLUSTER_NAME }}-application/(.*)$ /$1 break; + proxy_pass http://{{ MASTER_IP }}:20888; + proxy_redirect http://{{ MASTER_IP }}:20888/ $scheme://$host/{{ CLUSTER_NAME }}-application/; + proxy_http_version 1.1; + proxy_set_header Accept-Encoding ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter_types *; + sub_filter_once off; + sub_filter '/proxy/' '/{{ CLUSTER_NAME }}-application/proxy/'; +} + +{% for item in slaves %} +location /{{ CLUSTER_NAME }}-{{ item.name }}/ { + rewrite ^/{{ CLUSTER_NAME }}-{{ item.name }}/(.*)$ /$1 break; + proxy_pass http://{{ item.ip }}:8042; + proxy_redirect http://{{ item.ip }}:8042/ $scheme://$host/{{ CLUSTER_NAME }}-{{ item.name }}/; + proxy_http_version 1.1; + proxy_set_header Accept-Encoding ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter_types *; + sub_filter_once off; + sub_filter '/static/' '/{{ CLUSTER_NAME }}-{{ item.name }}/static/'; + sub_filter '/node/' '/{{ CLUSTER_NAME }}-{{ item.name }}/node/'; + sub_filter '/conf' '/{{ CLUSTER_NAME }}-{{ item.name }}/conf'; + sub_filter '/logs' '/{{ CLUSTER_NAME }}-{{ item.name }}/logs'; + sub_filter '/stacks' '/{{ CLUSTER_NAME }}-{{ item.name }}/stacks'; + sub_filter '/jmx' '/{{ CLUSTER_NAME }}-{{ item.name }}/jmx'; + sub_filter '//{{ MASTER_DNS }}:8088' '//$host/{{ CLUSTER_NAME }}/'; +} + +{% endfor %} diff --git a/infrastructure-provisioning/src/project/templates/locations/jupyter.conf b/infrastructure-provisioning/src/project/templates/locations/jupyter.conf new file mode 100644 index 0000000000..56f98ed39c --- /dev/null +++ b/infrastructure-provisioning/src/project/templates/locations/jupyter.conf @@ -0,0 +1,29 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +location ~* /{{ NAME }}/.* { + proxy_pass http://{{ IP }}:8888; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; +} diff --git a/infrastructure-provisioning/src/project/templates/locations/rstudio.conf b/infrastructure-provisioning/src/project/templates/locations/rstudio.conf new file mode 100644 index 0000000000..4c63f97d39 --- /dev/null +++ b/infrastructure-provisioning/src/project/templates/locations/rstudio.conf @@ -0,0 +1,30 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +location /{{ NAME }}/ { + rewrite ^/{{ NAME }}/(.*)$ /$1 break; + proxy_pass http://{{ IP }}:8787; + proxy_redirect http://{{ IP }}:8787/ $scheme://$host/{{ NAME }}/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_read_timeout 20d; +} + diff --git a/infrastructure-provisioning/src/project/templates/locations/spark.conf b/infrastructure-provisioning/src/project/templates/locations/spark.conf new file mode 100644 index 0000000000..554de783b3 --- /dev/null +++ b/infrastructure-provisioning/src/project/templates/locations/spark.conf @@ -0,0 +1,123 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +location /{{ CLUSTER_NAME }}/ { + rewrite ^/{{ CLUSTER_NAME }}/(.*)$ /$1 break; + proxy_pass http://{{ MASTER_IP }}:8080; + proxy_redirect http://{{ MASTER_IP }}:8080/ $scheme://$host/{{ CLUSTER_NAME }}/; + proxy_set_header Accept-Encoding ""; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter_types *; + sub_filter_once off; + sub_filter '/static/' '/{{ CLUSTER_NAME }}/static/'; + sub_filter '/app/' '/{{ CLUSTER_NAME }}/app/'; + sub_filter ' /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON -- \ + $DAEMON_OPTS 2>/dev/null \ + || return 2 +} + +test_config() { + # Test the nginx configuration + $DAEMON -t $DAEMON_OPTS >/dev/null 2>&1 +} + +stop_nginx() { + # Stops the daemon/service + # + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=$STOP_SCHEDULE --pidfile $PID --name $NAME + RETVAL="$?" + sleep 1 + return "$RETVAL" +} + +reload_nginx() { + # Function that sends a SIGHUP to the daemon/service + start-stop-daemon --stop --signal HUP --quiet --pidfile $PID --name $NAME + return 0 +} + +rotate_logs() { + # Rotate log files + start-stop-daemon --stop --signal USR1 --quiet --pidfile $PID --name $NAME + return 0 +} + +upgrade_nginx() { + # Online upgrade nginx executable + # http://nginx.org/en/docs/control.html + # + # Return + # 0 if nginx has been successfully upgraded + # 1 if nginx is not running + # 2 if the pid files were not created on time + # 3 if the old master could not be killed + if start-stop-daemon --stop --signal USR2 --quiet --pidfile $PID --name $NAME; then + # Wait for both old and new master to write their pid file + while [ ! -s "${PID}.oldbin" ] || [ ! -s "${PID}" ]; do + cnt=`expr $cnt + 1` + if [ $cnt -gt 10 ]; then + return 2 + fi + sleep 1 + done + # Everything is ready, gracefully stop the old master + if start-stop-daemon --stop --signal QUIT --quiet --pidfile "${PID}.oldbin" --name $NAME; then + return 0 + else + return 3 + fi + else + return 1 + fi +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + start_nginx + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + stop_nginx + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + restart) + log_daemon_msg "Restarting $DESC" "$NAME" + + # Check configuration before stopping nginx + if ! test_config; then + log_end_msg 1 # Configuration error + exit $? + fi + + stop_nginx + case "$?" in + 0|1) + start_nginx + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + reload|force-reload) + log_daemon_msg "Reloading $DESC configuration" "$NAME" + + # Check configuration before stopping nginx + # + # This is not entirely correct since the on-disk nginx binary + # may differ from the in-memory one, but that's not common. + # We prefer to check the configuration and return an error + # to the administrator. + if ! test_config; then + log_end_msg 1 # Configuration error + exit $? + fi + + reload_nginx + log_end_msg $? + ;; + configtest|testconfig) + log_daemon_msg "Testing $DESC configuration" + test_config + log_end_msg $? + ;; + status) + status_of_proc -p $PID "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + upgrade) + log_daemon_msg "Upgrading binary" "$NAME" + upgrade_nginx + log_end_msg $? + ;; + rotate) + log_daemon_msg "Re-opening $DESC log files" "$NAME" + rotate_logs + log_end_msg $? + ;; + *) + echo "Usage: $NAME {start|stop|restart|reload|force-reload|status|configtest|rotate|upgrade}" >&2 + exit 3 + ;; +esac diff --git a/infrastructure-provisioning/src/project/templates/nginx_redhat b/infrastructure-provisioning/src/project/templates/nginx_redhat new file mode 100644 index 0000000000..8f2c4c956a --- /dev/null +++ b/infrastructure-provisioning/src/project/templates/nginx_redhat @@ -0,0 +1,128 @@ +#!/bin/sh +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +# +# nginx - this script starts and stops the nginx daemon +# +# chkconfig: - 85 15 +# description: Nginx is an HTTP(S) server, HTTP(S) reverse \ +# proxy and IMAP/POP3 proxy server +# processname: nginx +# config: /etc/nginx/nginx.conf +# pidfile: /var/run/nginx.pid +# user: nginx + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Check that networking is up. +[ "$NETWORKING" = "no" ] && exit 0 + +nginx="/usr/sbin/nginx" +prog=$(basename $nginx) + +NGINX_CONF_FILE="/etc/nginx/nginx.conf" + +lockfile=/var/run/nginx.lock + +start() { + [ -x $nginx ] || exit 5 + [ -f $NGINX_CONF_FILE ] || exit 6 + echo -n $"Starting $prog: " + daemon $nginx -c $NGINX_CONF_FILE + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc $prog -QUIT + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + configtest || return $? + stop + start +} + +reload() { + configtest || return $? + echo -n $"Reloading $prog: " + killproc $nginx -HUP + RETVAL=$? + echo +} + +force_reload() { + restart +} + +configtest() { + $nginx -t -c $NGINX_CONF_FILE +} + +rh_status() { + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart|configtest) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}" + exit 2 +esac diff --git a/infrastructure-provisioning/src/project/templates/squid.conf b/infrastructure-provisioning/src/project/templates/squid.conf new file mode 100644 index 0000000000..0129e00d08 --- /dev/null +++ b/infrastructure-provisioning/src/project/templates/squid.conf @@ -0,0 +1,62 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +auth_param basic program LDAP_AUTH_PATH -b "LDAP_DN" -D "LDAP_SERVICE_USERNAME,LDAP_DN" -w LDAP_SERVICE_PASSWORD -f uid=%s LDAP_HOST + +acl DLab_user_src_subnet src PROXY_SUBNET +VPC_CIDRS +ALLOWED_CIDRS + + +acl SSL_ports port 443 +acl Safe_ports port 80 # http +acl Safe_ports port 21 # ftp +acl Safe_ports port 22 # ssh +acl Safe_ports port 443 # https +acl Safe_ports port 70 # gopher +acl Safe_ports port 210 # wais +acl Safe_ports port 1025-65535 # unregistered ports +acl Safe_ports port 280 # http-mgmt +acl Safe_ports port 488 # gss-http +acl Safe_ports port 591 # filemaker +acl Safe_ports port 777 # multiling http +acl CONNECT method CONNECT + +acl ldap-auth proxy_auth EDGE_USER_NAME + +http_access deny !Safe_ports +http_access allow localhost manager +http_access deny manager +http_access allow DLab_user_src_subnet +http_access allow AllowedCIDRS ldap-auth +http_access allow localhost +http_access deny all + +http_port 3128 + +cache deny all +cache_dir null /tmp +coredump_dir /var/spool/squid + +refresh_pattern ^ftp: 1440 20% 10080 +refresh_pattern ^gopher: 1440 0% 1440 +refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 +refresh_pattern . 0 20% 4320 From ea20f109855aec57fb2cfd2f4ef2f7bbe71d0b5a Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 24 Jun 2019 17:07:50 +0300 Subject: [PATCH 211/357] create.py fixed adge_associate_elastic_ip.py fixed --- infrastructure-provisioning/src/general/api/create.py | 4 ++-- .../src/general/scripts/aws/edge_associate_elastic_ip.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure-provisioning/src/general/api/create.py b/infrastructure-provisioning/src/general/api/create.py index bae44b4f19..b2437b0cd4 100644 --- a/infrastructure-provisioning/src/general/api/create.py +++ b/infrastructure-provisioning/src/general/api/create.py @@ -56,10 +56,10 @@ response_file.write(json.dumps(reply)) else: reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['project_tag'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_tag'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_associate_elastic_ip.py b/infrastructure-provisioning/src/general/scripts/aws/edge_associate_elastic_ip.py index c058002e0c..131ac46c2a 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_associate_elastic_ip.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_associate_elastic_ip.py @@ -36,7 +36,7 @@ args = parser.parse_args() if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_tag'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', From 12c7d8dd7ddca38b9f00ecf6d4c35bb4aac0d28f Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 25 Jun 2019 11:46:03 +0300 Subject: [PATCH 212/357] project_name instead edge_user_name fixed --- .../aws/common_create_notebook_image.py | 8 +- ...n_notebook_configure_dataengine-service.py | 8 +- .../common_notebook_configure_dataengine.py | 6 +- .../scripts/aws/common_prepare_notebook.py | 15 +- .../scripts/aws/common_start_notebook.py | 2 +- .../scripts/aws/common_stop_notebook.py | 4 +- .../scripts/aws/common_terminate_notebook.py | 4 +- .../aws/dataengine-service_configure.py | 16 +- .../scripts/aws/dataengine-service_create.py | 18 +- .../aws/dataengine-service_install_libs.py | 2 +- .../aws/dataengine-service_list_libs.py | 2 +- .../scripts/aws/dataengine-service_prepare.py | 18 +- .../aws/dataengine-service_terminate.py | 4 +- .../scripts/aws/dataengine_configure.py | 16 +- .../general/scripts/aws/dataengine_prepare.py | 14 +- .../general/scripts/aws/dataengine_start.py | 6 +- .../general/scripts/aws/dataengine_stop.py | 6 +- .../scripts/aws/dataengine_terminate.py | 6 +- .../scripts/aws/deeplearning_configure.py | 12 +- .../src/general/scripts/aws/edge_configure.py | 2 +- .../src/general/scripts/aws/edge_prepare.py | 573 ------------------ .../src/general/scripts/aws/edge_start.py | 4 +- .../src/general/scripts/aws/edge_status.py | 2 +- .../src/general/scripts/aws/edge_stop.py | 4 +- .../src/general/scripts/aws/edge_terminate.py | 129 ---- .../general/scripts/aws/jupyter_configure.py | 12 +- ...pyter_dataengine-service_create_configs.py | 4 +- ...yter_install_dataengine-service_kernels.py | 4 +- .../general/scripts/aws/project_prepare.py | 28 +- .../general/scripts/aws/project_terminate.py | 8 +- .../general/scripts/aws/rstudio_configure.py | 12 +- ...tudio_dataengine-service_create_configs.py | 2 +- ...udio_install_dataengine-service_kernels.py | 4 +- .../scripts/aws/tensor-rstudio_configure.py | 14 +- .../general/scripts/aws/tensor_configure.py | 14 +- .../general/scripts/aws/zeppelin_configure.py | 12 +- ...pelin_dataengine-service_create_configs.py | 6 +- ...elin_install_dataengine-service_kernels.py | 6 +- 38 files changed, 156 insertions(+), 851 deletions(-) delete mode 100644 infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py delete mode 100644 infrastructure-provisioning/src/general/scripts/aws/edge_terminate.py diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_create_notebook_image.py b/infrastructure-provisioning/src/general/scripts/aws/common_create_notebook_image.py index d50b0ba68f..3d418c1109 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_create_notebook_image.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_create_notebook_image.py @@ -34,18 +34,18 @@ image_conf = dict() create_aws_config_files() image_conf['service_base_name'] = os.environ['conf_service_base_name'] - image_conf['user_name'] = os.environ['edge_user_name'] + image_conf['project_tag'] = os.environ['project_name'] image_conf['instance_name'] = os.environ['notebook_instance_name'] image_conf['instance_tag'] = '{}-Tag'.format(image_conf['service_base_name']) image_conf['application'] = os.environ['application'] image_conf['image_name'] = os.environ['notebook_image_name'].lower().replace('_', '-') image_conf['full_image_name'] = '{}-{}-{}-{}'.format(image_conf['service_base_name'], - image_conf['user_name'], + image_conf['project_tag'], image_conf['application'], image_conf['image_name']).lower() image_conf['tags'] = {"Name": image_conf['service_base_name'], "SBN": image_conf['service_base_name'], - "User": image_conf['user_name'], + "Project": image_conf['project_tag'], "Image": image_conf['image_name'], "FIN": image_conf['full_image_name'], os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']} @@ -61,7 +61,7 @@ with open("/root/result.json", 'w') as result: res = {"notebook_image_name": image_conf['image_name'], "full_image_name": image_conf['full_image_name'], - "user_name": image_conf['user_name'], + "project_tag": image_conf['project_tag'], "application": image_conf['application'], "status": "created", "Action": "Create image from notebook"} diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py index 413ccbf3f3..106f062438 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py @@ -32,7 +32,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -53,7 +53,7 @@ notebook_config['notebook_name']).get('Private') notebook_config['key_path'] = os.environ['conf_key_dir'] + '/' + os.environ['conf_key_name'] + '.pem' notebook_config['cluster_id'] = get_emr_id_by_name(notebook_config['cluster_name']) - edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_instance_hostname = get_instance_hostname(notebook_config['tag_name'], edge_instance_name) if os.environ['application'] == 'deeplearning': application = 'jupyter' @@ -63,10 +63,10 @@ try: logging.info('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]') print('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]') - params = "--bucket {} --cluster_name {} --emr_version {} --keyfile {} --notebook_ip {} --region {} --emr_excluded_spark_properties {} --edge_user_name {} --os_user {} --edge_hostname {} --proxy_port {} --scala_version {} --application {} --pip_mirror {}" \ + params = "--bucket {} --cluster_name {} --emr_version {} --keyfile {} --notebook_ip {} --region {} --emr_excluded_spark_properties {} --project_name {} --os_user {} --edge_hostname {} --proxy_port {} --scala_version {} --application {} --pip_mirror {}" \ .format(notebook_config['bucket_name'], notebook_config['cluster_name'], os.environ['emr_version'], notebook_config['key_path'], notebook_config['notebook_ip'], os.environ['aws_region'], - os.environ['emr_excluded_spark_properties'], os.environ['edge_user_name'], + os.environ['emr_excluded_spark_properties'], os.environ['project_name'], os.environ['conf_os_user'], edge_instance_hostname, '3128', os.environ['notebook_scala_version'], os.environ['application'], os.environ['conf_pypi_mirror']) try: diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py index 9610083e33..8e969c2d69 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py @@ -32,7 +32,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -55,8 +55,8 @@ notebook_config['service_base_name'] = os.environ['conf_service_base_name'] notebook_config['region'] = os.environ['aws_region'] notebook_config['tag_name'] = notebook_config['service_base_name'] + '-Tag' - notebook_config['user_name'] = os.environ['edge_user_name'] - notebook_config['cluster_name'] = notebook_config['service_base_name'] + '-' + notebook_config['user_name'] + \ + notebook_config['project_tag'] = os.environ['project_name'] + notebook_config['cluster_name'] = notebook_config['service_base_name'] + '-' + notebook_config['project_tag'] + \ '-de-' + notebook_config['exploratory_name'] + '-' + \ notebook_config['computational_name'] notebook_config['master_node_name'] = notebook_config['cluster_name'] + '-m' diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py index eecfae67de..4ae9e1767c 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py @@ -36,7 +36,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -46,7 +46,7 @@ # generating variables dictionary create_aws_config_files() edge_status = get_instance_status(os.environ['conf_service_base_name'] + '-Tag', - os.environ['conf_service_base_name'] + '-' + os.environ['edge_user_name'] + '-edge') + os.environ['conf_service_base_name'] + '-' + os.environ['project_name'] + '-edge') if edge_status != 'running': logging.info('ERROR: Edge node is unavailable! Aborting...') print('ERROR: Edge node is unavailable! Aborting...') @@ -64,13 +64,13 @@ notebook_config['instance_type'] = os.environ['aws_notebook_instance_type'] notebook_config['key_name'] = os.environ['conf_key_name'] notebook_config['instance_name'] = '{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], notebook_config['exploratory_name'], args.uuid) notebook_config['primary_disk_size'] = (lambda x: '30' if x == 'deeplearning' else '12')(os.environ['application']) notebook_config['role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) + .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['project_name']) notebook_config['security_group_name'] = '{}-{}-nb-SG'.format(notebook_config['service_base_name'], - os.environ['edge_user_name']) + os.environ['project_name']) notebook_config['tag_name'] = '{}-Tag'.format(notebook_config['service_base_name']) notebook_config['expected_image_name'] = '{}-{}-notebook-image'.format(notebook_config['service_base_name'], @@ -88,7 +88,7 @@ print('No pre-configured image found. Using default one: {}'.format(notebook_config['ami_id'])) tag = {"Key": notebook_config['tag_name'], - "Value": "{}-{}-subnet".format(notebook_config['service_base_name'], os.environ['edge_user_name'])} + "Value": "{}-{}-subnet".format(notebook_config['service_base_name'], os.environ['project_name'])} notebook_config['subnet_cidr'] = get_subnet_by_tag(tag) keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], os.environ['conf_key_name']) @@ -108,6 +108,9 @@ os.environ['notebook_disk_size'], notebook_config['primary_disk_size']) try: local("~/scripts/{}.py {}".format('common_create_instance', params)) + notebook_instance = get_instance_by_name(notebook_config['tag_name'], notebook_config['instance_name']) + project_tag = {"Key": 'project_tag', "Value": os.environ['project_name']} + create_tag(notebook_instance, project_tag) except: traceback.print_exc() raise Exception diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py index 3bd537ab2c..d76918bd4b 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py @@ -33,7 +33,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py index 3d6ed46c48..58cc932b8d 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py @@ -51,7 +51,7 @@ def stop_notebook(nb_tag_value, bucket_name, tag_name, ssh_user, key_path): for tag in cluster.get('Tags'): if tag.get('Key') == 'ComputationalName': computational_name = tag.get('Value') - s3_cleanup(bucket_name, emr_name, os.environ['edge_user_name']) + s3_cleanup(bucket_name, emr_name, os.environ['project_name']) print("The bucket {} has been cleaned successfully".format(bucket_name)) terminate_emr(cluster_id) print("The EMR cluster {} has been terminated successfully".format(emr_name)) @@ -87,7 +87,7 @@ def stop_notebook(nb_tag_value, bucket_name, tag_name, ssh_user, key_path): if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py index c1e6bf7a15..4a6edac750 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py @@ -42,7 +42,7 @@ def terminate_nb(nb_tag_value, bucket_name, tag_name): cluster = cluster.get("Cluster") emr_name = cluster.get('Name') print('Cleaning bucket from configs for cluster {}'.format(emr_name)) - s3_cleanup(bucket_name, emr_name, os.environ['edge_user_name']) + s3_cleanup(bucket_name, emr_name, os.environ['project_name']) print("The bucket {} has been cleaned successfully".format(bucket_name)) print('Terminating cluster {}'.format(emr_name)) terminate_emr(cluster_id) @@ -66,7 +66,7 @@ def terminate_nb(nb_tag_value, bucket_name, tag_name): if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py index 7652900eb2..5e7e52fab6 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py @@ -157,7 +157,7 @@ def configure_dataengine_service(instance, emr_conf): if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -192,30 +192,30 @@ def configure_dataengine_service(instance, emr_conf): emr_conf['network_type'] = os.environ['conf_network_type'] emr_conf['role_service_name'] = os.environ['emr_service_role'] emr_conf['role_ec2_name'] = os.environ['emr_ec2_role'] - emr_conf['tags'] = 'Name=' + emr_conf['service_base_name'] + '-' + os.environ['edge_user_name'] + '-des-' + \ + emr_conf['tags'] = 'Name=' + emr_conf['service_base_name'] + '-' + os.environ['project_name'] + '-des-' + \ emr_conf['exploratory_name'] + '-' + emr_conf['computational_name'] + '-' + args.uuid + \ ', ' + emr_conf['service_base_name'] + '-Tag=' + emr_conf['service_base_name'] + '-' + \ - os.environ['edge_user_name'] + '-des-' + emr_conf['exploratory_name'] + '-' + \ + os.environ['project_name'] + '-des-' + emr_conf['exploratory_name'] + '-' + \ emr_conf['computational_name'] + '-' + args.uuid + \ ', Notebook=' + os.environ['notebook_instance_name'] + ', State=not-configured' - emr_conf['cluster_name'] = emr_conf['service_base_name'] + '-' + os.environ['edge_user_name'] + '-des-' + \ + emr_conf['cluster_name'] = emr_conf['service_base_name'] + '-' + os.environ['project_name'] + '-des-' + \ emr_conf['exploratory_name'] + '-' + emr_conf['computational_name'] + '-' + \ args.uuid emr_conf['bucket_name'] = (emr_conf['service_base_name'] + '-ssn-bucket').lower().replace('_', '-') tag = {"Key": "{}-Tag".format(emr_conf['service_base_name']), "Value": "{}-{}-subnet".format( - emr_conf['service_base_name'], os.environ['edge_user_name'])} + emr_conf['service_base_name'], os.environ['project_name'])} emr_conf['subnet_cidr'] = get_subnet_by_tag(tag) emr_conf['key_path'] = os.environ['conf_key_dir'] + '/' + os.environ['conf_key_name'] + '.pem' emr_conf['all_ip_cidr'] = '0.0.0.0/0' emr_conf['additional_emr_sg_name'] = '{}-{}-de-se-additional-sg'.format(emr_conf['service_base_name'], - os.environ['edge_user_name']) + os.environ['project_name']) emr_conf['vpc_id'] = os.environ['aws_vpc_id'] emr_conf['cluster_id'] = get_emr_id_by_name(emr_conf['cluster_name']) emr_conf['cluster_instances'] = get_emr_instances_list(emr_conf['cluster_id']) emr_conf['cluster_master_instances'] = get_emr_instances_list(emr_conf['cluster_id'], 'MASTER') emr_conf['cluster_core_instances'] = get_emr_instances_list(emr_conf['cluster_id'], 'CORE') - emr_conf['edge_instance_name'] = emr_conf['service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + emr_conf['edge_instance_name'] = emr_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge' emr_conf['edge_instance_hostname'] = get_instance_private_ip_address(emr_conf['tag_name'], emr_conf['edge_instance_name']) if emr_conf['network_type'] == 'private': @@ -224,7 +224,7 @@ def configure_dataengine_service(instance, emr_conf): else: emr_conf['edge_instance_ip'] = get_instance_ip_address(emr_conf['tag_name'], emr_conf['edge_instance_name']).get('Public') - emr_conf['user_keyname'] = os.environ['edge_user_name'] + emr_conf['user_keyname'] = os.environ['project_name'] emr_conf['os_user'] = os.environ['conf_os_user'] emr_conf['initial_user'] = 'ec2-user' emr_conf['sudo_group'] = 'wheel' diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py index f9f9bc4667..995d9a2083 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py @@ -66,7 +66,7 @@ parser.add_argument('--configurations', type=str, default='') parser.add_argument('--region', type=str, default='') parser.add_argument('--key_dir', type=str, default='') -parser.add_argument('--edge_user_name', type=str, default='') +parser.add_argument('--project_name', type=str, default='') parser.add_argument('--slave_instance_spot', type=str, default='False') parser.add_argument('--bid_price', type=str, default='') parser.add_argument('--service_base_name', type=str, default='') @@ -100,7 +100,7 @@ args.name, args.nbs_user, args.region, - args.edge_user_name, + args.project_name, args.name, endpoint_url) @@ -123,7 +123,7 @@ args.release_label, args.region, args.release_label, - args.edge_user_name, + args.project_name, args.name, endpoint_url) @@ -172,9 +172,9 @@ def upload_user_key(args): try: s3 = boto3.resource('s3', config=Config(signature_version='s3v4')) s3.meta.client.upload_file(args.key_dir + '/' + - args.edge_user_name + '.pub', - args.s3_bucket, args.edge_user_name + - '/' + args.edge_user_name + '.pub', + args.project_name + '.pub', + args.s3_bucket, args.project_name + + '/' + args.project_name + '.pub', ExtraArgs={'ServerSideEncryption': 'AES256'}) s3.meta.client.upload_file( '/root/scripts/dataengine-service_key_importer.py', @@ -194,7 +194,7 @@ def remove_user_key(args): config=Config(signature_version='s3v4'), region_name=args.region) client.delete_object(Bucket=args.s3_bucket, - Key=args.edge_user_name + '.pub') + Key=args.project_name + '.pub') except Exception as err: logging.error("Unable to remove user key: " + @@ -233,7 +233,7 @@ def emr_sg(id): def wait_emr(bucket, cluster_name, timeout, delay=30): deadline = time.time() + timeout - prefix = args.edge_user_name + '/' + cluster_name + "/config/" + prefix = args.project_name + '/' + cluster_name + "/config/" global cluster_id while time.time() < deadline: state = action_validate(cluster_id) @@ -473,5 +473,5 @@ def build_emr_cluster(args): out.close() if action_validate(cluster_id)[0] == "True": terminate_emr(cluster_id) - s3_cleanup(args.s3_bucket, args.name, args.edge_user_name) + s3_cleanup(args.s3_bucket, args.name, args.project_name) sys.exit(1) diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_install_libs.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_install_libs.py index 946910bcf6..a8a1e47b15 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_install_libs.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_install_libs.py @@ -48,7 +48,7 @@ def install_libs(instance, data_engine): if __name__ == "__main__": create_aws_config_files() instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_list_libs.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_list_libs.py index 4c11795926..e4a0f38795 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_list_libs.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_list_libs.py @@ -32,7 +32,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py index ef9b067855..626e9dc2a4 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py @@ -39,7 +39,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -53,7 +53,7 @@ time.sleep(30) create_aws_config_files() edge_status = get_instance_status(os.environ['conf_service_base_name'] + '-Tag', - os.environ['conf_service_base_name'] + '-' + os.environ['edge_user_name'] + '-edge') + os.environ['conf_service_base_name'] + '-' + os.environ['project_name'] + '-edge') if edge_status != 'running': logging.info('ERROR: Edge node is unavailable! Aborting...') print('ERROR: Edge node is unavailable! Aborting...') @@ -81,7 +81,7 @@ emr_conf['key_name'] = os.environ['conf_key_name'] emr_conf['region'] = os.environ['aws_region'] emr_conf['release_label'] = os.environ['emr_version'] - emr_conf['edge_instance_name'] = '{0}-{1}-edge'.format(emr_conf['service_base_name'], os.environ['edge_user_name']) + emr_conf['edge_instance_name'] = '{0}-{1}-edge'.format(emr_conf['service_base_name'], os.environ['project_name']) emr_conf['edge_security_group_name'] = '{0}-SG'.format(emr_conf['edge_instance_name']) emr_conf['master_instance_type'] = os.environ['emr_master_instance_type'] emr_conf['slave_instance_type'] = os.environ['emr_slave_instance_type'] @@ -96,13 +96,13 @@ 'State=not-configured,' \ 'ComputationalName={3}' \ .format(emr_conf['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], emr_conf['exploratory_name'], emr_conf['computational_name'], os.environ['notebook_instance_name']) emr_conf['cluster_name'] = '{0}-{1}-des-{2}-{3}-{4}'\ .format(emr_conf['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], emr_conf['exploratory_name'], emr_conf['computational_name'], args.uuid) @@ -113,12 +113,12 @@ tag = {"Key": "{}-Tag".format(emr_conf['service_base_name']), "Value": "{}-{}-subnet".format(emr_conf['service_base_name'], - os.environ['edge_user_name'])} + os.environ['project_name'])} emr_conf['subnet_cidr'] = get_subnet_by_tag(tag) emr_conf['key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) emr_conf['all_ip_cidr'] = '0.0.0.0/0' emr_conf['additional_emr_sg_name'] = '{}-{}-de-se-additional-sg'\ - .format(emr_conf['service_base_name'], os.environ['edge_user_name']) + .format(emr_conf['service_base_name'], os.environ['project_name']) emr_conf['vpc_id'] = os.environ['aws_vpc_id'] emr_conf['vpc2_id'] = os.environ['aws_notebook_vpc_id'] if os.environ['emr_slave_instance_spot'] == 'True': @@ -258,7 +258,7 @@ "--region {14} " \ "--tags '{15}' " \ "--key_dir {16} " \ - "--edge_user_name {17} " \ + "--project_name {17} " \ "--slave_instance_spot {18} " \ "--bid_price {19} " \ "--service_base_name {20} " \ @@ -281,7 +281,7 @@ emr_conf['region'], emr_conf['tags'], os.environ['conf_key_dir'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['emr_slave_instance_spot'], str(emr_conf['slave_bid_price']), emr_conf['service_base_name'], diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py index a08b865e28..462b403dd3 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py @@ -44,7 +44,7 @@ def terminate_emr_cluster(emr_name, bucket_name, tag_name, nb_tag_value, ssh_use for tag in cluster.get('Tags'): if tag.get('Key') == 'ComputationalName': computational_name = tag.get('Value') - s3_cleanup(bucket_name, emr_name, os.environ['edge_user_name']) + s3_cleanup(bucket_name, emr_name, os.environ['project_name']) print("The bucket {} has been cleaned successfully".format(bucket_name)) terminate_emr(cluster_id) print("The EMR cluster {} has been terminated successfully".format(emr_name)) @@ -58,7 +58,7 @@ def terminate_emr_cluster(emr_name, bucket_name, tag_name, nb_tag_value, ssh_use if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py index 96fb8d2cc8..c9b8bc1640 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py @@ -143,7 +143,7 @@ def configure_slave(slave_number, data_engine): if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -166,7 +166,7 @@ def configure_slave(slave_number, data_engine): data_engine['key_name'] = os.environ['conf_key_name'] data_engine['region'] = os.environ['aws_region'] data_engine['network_type'] = os.environ['conf_network_type'] - data_engine['cluster_name'] = data_engine['service_base_name'] + '-' + os.environ['edge_user_name'] + \ + data_engine['cluster_name'] = data_engine['service_base_name'] + '-' + os.environ['project_name'] + \ '-de-' + data_engine['exploratory_name'] + '-' + \ data_engine['computational_name'] data_engine['master_node_name'] = data_engine['cluster_name'] + '-m' @@ -174,21 +174,21 @@ def configure_slave(slave_number, data_engine): data_engine['master_size'] = os.environ['aws_dataengine_master_shape'] data_engine['slave_size'] = os.environ['aws_dataengine_slave_shape'] data_engine['dataengine_master_security_group_name'] = data_engine['service_base_name'] + '-' + \ - os.environ['edge_user_name'] + '-dataengine-master-sg' + os.environ['project_name'] + '-dataengine-master-sg' data_engine['dataengine_slave_security_group_name'] = data_engine['service_base_name'] + '-' + \ - os.environ['edge_user_name'] + '-dataengine-slave-sg' + os.environ['project_name'] + '-dataengine-slave-sg' data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag' tag = {"Key": data_engine['tag_name'], - "Value": "{}-{}-subnet".format(data_engine['service_base_name'], os.environ['edge_user_name'])} + "Value": "{}-{}-subnet".format(data_engine['service_base_name'], os.environ['project_name'])} data_engine['subnet_cidr'] = get_subnet_by_tag(tag) data_engine['notebook_dataengine_role_profile_name'] = data_engine['service_base_name']. \ lower().replace('-', '_') + "-" + \ - os.environ['edge_user_name'] + '-nb-de-Profile' + os.environ['project_name'] + '-nb-de-Profile' data_engine['instance_count'] = int(os.environ['dataengine_instance_count']) master_node_hostname = get_instance_hostname(data_engine['tag_name'], data_engine['master_node_name']) data_engine['dlab_ssh_user'] = os.environ['conf_os_user'] keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], os.environ['conf_key_name']) - edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_instance_hostname = get_instance_hostname(data_engine['tag_name'], edge_instance_name) edge_instance_private_ip = get_instance_ip_address(data_engine['tag_name'], edge_instance_name).get('Private') if data_engine['network_type'] == 'private': @@ -204,7 +204,7 @@ def configure_slave(slave_number, data_engine): sudo_group = 'wheel' except Exception as err: data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag' - data_engine['cluster_name'] = data_engine['service_base_name'] + '-' + os.environ['edge_user_name'] + \ + data_engine['cluster_name'] = data_engine['service_base_name'] + '-' + os.environ['project_name'] + \ '-de-' + data_engine['exploratory_name'] + '-' + \ data_engine['computational_name'] data_engine['master_node_name'] = data_engine['cluster_name'] + '-m' diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py index 511cad3074..2a8198d2c0 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py @@ -36,7 +36,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -46,7 +46,7 @@ create_aws_config_files() edge_status = get_instance_status(os.environ['conf_service_base_name'] + '-Tag', os.environ['conf_service_base_name'] + '-' + os.environ[ - 'edge_user_name'] + '-edge') + 'project_name'] + '-edge') if edge_status != 'running': logging.info('ERROR: Edge node is unavailable! Aborting...') print('ERROR: Edge node is unavailable! Aborting...') @@ -70,7 +70,7 @@ data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag' data_engine['key_name'] = os.environ['conf_key_name'] data_engine['region'] = os.environ['aws_region'] - data_engine['cluster_name'] = data_engine['service_base_name'] + '-' + os.environ['edge_user_name'] + \ + data_engine['cluster_name'] = data_engine['service_base_name'] + '-' + os.environ['project_name'] + \ '-de-' + data_engine['exploratory_name'] + '-' + \ data_engine['computational_name'] data_engine['master_node_name'] = '{}-m'.format(data_engine['cluster_name']) @@ -78,15 +78,15 @@ data_engine['master_size'] = os.environ['aws_dataengine_master_shape'] data_engine['slave_size'] = os.environ['aws_dataengine_slave_shape'] data_engine['dataengine_master_security_group_name'] = '{}-{}-dataengine-master-sg' \ - .format(data_engine['service_base_name'], os.environ['edge_user_name']) + .format(data_engine['service_base_name'], os.environ['project_name']) data_engine['dataengine_slave_security_group_name'] = '{}-{}-dataengine-slave-sg' \ - .format(data_engine['service_base_name'], os.environ['edge_user_name']) + .format(data_engine['service_base_name'], os.environ['project_name']) data_engine['tag_name'] = '{}-Tag'.format(data_engine['service_base_name']) tag = {"Key": data_engine['tag_name'], - "Value": "{}-{}-subnet".format(data_engine['service_base_name'], os.environ['edge_user_name'])} + "Value": "{}-{}-subnet".format(data_engine['service_base_name'], os.environ['project_name'])} data_engine['subnet_cidr'] = get_subnet_by_tag(tag) data_engine['notebook_dataengine_role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(data_engine['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) + .format(data_engine['service_base_name'].lower().replace('-', '_'), os.environ['project_name']) data_engine['instance_count'] = int(os.environ['dataengine_instance_count']) data_engine['cluster_nodes_tag'] = {"Key": "dataengine_notebook_name", "Value": os.environ['notebook_instance_name']} diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py index 6f12119fb2..c7b4f99d3c 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py @@ -38,7 +38,7 @@ def start_data_engine(cluster_name): if __name__ == "__main__": local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + \ os.environ['conf_resource'] + "/" + local_log_filename @@ -60,10 +60,10 @@ def start_data_engine(cluster_name): except: data_engine['computational_name'] = '' data_engine['service_base_name'] = os.environ['conf_service_base_name'] - data_engine['user_name'] = os.environ['edge_user_name'] + data_engine['project_tag'] = os.environ['project_name'] data_engine['cluster_name'] = \ data_engine['service_base_name'] + '-' + \ - data_engine['user_name'] + '-de-' + \ + data_engine['project_tag'] + '-de-' + \ data_engine['exploratory_name'] + '-' + \ data_engine['computational_name'] diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py index 5349b8cc47..58b069185e 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py @@ -38,7 +38,7 @@ def stop_data_engine(cluster_name): if __name__ == "__main__": local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + \ os.environ['conf_resource'] + "/" + local_log_filename @@ -59,10 +59,10 @@ def stop_data_engine(cluster_name): except: data_engine_config['computational_name'] = '' data_engine_config['service_base_name'] = os.environ['conf_service_base_name'] - data_engine_config['user_name'] = os.environ['edge_user_name'] + data_engine_config['project_tag'] = os.environ['project_name'] data_engine_config['cluster_name'] = \ data_engine_config['service_base_name'] + '-' \ - + data_engine_config['user_name'] + '-de-' + \ + + data_engine_config['project_tag'] + '-de-' + \ data_engine_config['exploratory_name'] + '-' \ + data_engine_config['computational_name'] diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_terminate.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_terminate.py index daa25ae542..f55ef91714 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_terminate.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_terminate.py @@ -48,7 +48,7 @@ def terminate_data_engine(tag_name, notebook_name, if __name__ == "__main__": local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + \ os.environ['conf_resource'] + "/" + local_log_filename @@ -70,10 +70,10 @@ def terminate_data_engine(tag_name, notebook_name, data_engine['computational_name'] = '' data_engine['service_base_name'] = os.environ['conf_service_base_name'] data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag' - data_engine['user_name'] = os.environ['edge_user_name'] + data_engine['project_tag'] = os.environ['project_name'] data_engine['cluster_name'] = \ data_engine['service_base_name'] + '-' + \ - data_engine['user_name'] + '-de-' + \ + data_engine['project_tag'] + '-de-' + \ data_engine['exploratory_name'] + '-' +\ data_engine['computational_name'] data_engine['notebook_name'] = os.environ['notebook_instance_name'] diff --git a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py index f98ae4dd8a..28e2544478 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py @@ -36,7 +36,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -51,18 +51,18 @@ notebook_config['service_base_name'] = os.environ['conf_service_base_name'] notebook_config['instance_type'] = os.environ['aws_notebook_instance_type'] notebook_config['key_name'] = os.environ['conf_key_name'] - notebook_config['user_keyname'] = os.environ['edge_user_name'] + notebook_config['user_keyname'] = os.environ['project_name'] notebook_config['network_type'] = os.environ['conf_network_type'] notebook_config['instance_name'] = '{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], notebook_config['exploratory_name'], args.uuid) notebook_config['expected_image_name'] = '{}-{}-notebook-image'.format(notebook_config['service_base_name'], os.environ['application']) notebook_config['notebook_image_name'] = str(os.environ.get('notebook_image_name')) notebook_config['role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) + .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['project_name']) notebook_config['security_group_name'] = '{}-{}-nb-SG'.format(notebook_config['service_base_name'], - os.environ['edge_user_name']) + os.environ['project_name']) notebook_config['tag_name'] = '{}-Tag'.format(notebook_config['service_base_name']) notebook_config['dlab_ssh_user'] = os.environ['conf_os_user'] notebook_config['shared_image_enabled'] = os.environ['conf_shared_image_enabled'] @@ -70,7 +70,7 @@ # generating variables regarding EDGE proxy on Notebook instance instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) - edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_instance_hostname = get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') if notebook_config['network_type'] == 'private': diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index f2970dd18d..4c971bdbe7 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -141,7 +141,7 @@ logging.info('[INSTALLING HTTP PROXY]') additional_config = {"exploratory_subnet": edge_conf['private_subnet_cidr'], "template_file": "/root/templates/squid.conf", - "edge_user_name": os.environ['aws_iam_user'], +# "edge_user_name": os.environ['aws_iam_user'], "ldap_host": os.environ['ldap_hostname'], "ldap_dn": os.environ['ldap_dn'], "ldap_user": os.environ['ldap_service_username'], diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py deleted file mode 100644 index ef7660af5a..0000000000 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py +++ /dev/null @@ -1,573 +0,0 @@ -#!/usr/bin/python - -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -import json -from dlab.fab import * -from dlab.meta_lib import * -import sys, time, os -from dlab.actions_lib import * -import traceback - - -if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - create_aws_config_files() - print('Generating infrastructure names and tags') - edge_conf = dict() - edge_conf['service_base_name'] = os.environ['conf_service_base_name'] - edge_conf['key_name'] = os.environ['conf_key_name'] - edge_conf['user_keyname'] = os.environ['edge_user_name'] - edge_conf['public_subnet_id'] = os.environ['aws_subnet_id'] - edge_conf['vpc_id'] = os.environ['aws_vpc_id'] - edge_conf['vpc2_id'] = os.environ['aws_notebook_vpc_id'] - edge_conf['region'] = os.environ['aws_region'] - edge_conf['ami_id'] = get_ami_id(os.environ['aws_{}_image_name'.format(os.environ['conf_os_family'])]) - edge_conf['instance_size'] = os.environ['aws_edge_instance_size'] - edge_conf['sg_ids'] = os.environ['aws_security_groups_ids'] - edge_conf['instance_name'] = '{}-{}-edge'.format(edge_conf['service_base_name'], os.environ['edge_user_name']) - edge_conf['tag_name'] = '{}-Tag'.format(edge_conf['service_base_name']) - edge_conf['bucket_name_tag'] = '{}-{}-bucket'.format(edge_conf['service_base_name'], - os.environ['edge_user_name']) - edge_conf['bucket_name'] = edge_conf['bucket_name_tag'].lower().replace('_', '-') - edge_conf['ssn_bucket_name'] = '{}-ssn-bucket'.format(edge_conf['service_base_name']).lower().replace('_', '-') - edge_conf['shared_bucket_name'] = '{}-shared-bucket'.format(edge_conf['service_base_name']).lower().replace('_', - '-') - edge_conf['role_name'] = '{}-{}-edge-Role'.format(edge_conf['service_base_name'].lower().replace('-', '_'), - os.environ['edge_user_name']) - edge_conf['role_profile_name'] = '{}-{}-edge-Profile'.format(edge_conf['service_base_name'].lower().replace('-', - '_'), - os.environ['edge_user_name']) - edge_conf['policy_name'] = '{}-{}-edge-Policy'.format(edge_conf['service_base_name'].lower().replace('-', '_'), - os.environ['edge_user_name']) - edge_conf['edge_security_group_name'] = '{}-SG'.format(edge_conf['instance_name']) - edge_conf['notebook_instance_name'] = '{}-{}-nb'.format(edge_conf['service_base_name'], - os.environ['edge_user_name']) - edge_conf['dataengine_instances_name'] = '{}-{}-dataengine' \ - .format(edge_conf['service_base_name'], os.environ['edge_user_name']) - edge_conf['notebook_dataengine_role_name'] = '{}-{}-nb-de-Role' \ - .format(edge_conf['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) - edge_conf['notebook_dataengine_policy_name'] = '{}-{}-nb-de-Policy' \ - .format(edge_conf['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) - edge_conf['notebook_dataengine_role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(edge_conf['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) - edge_conf['notebook_security_group_name'] = '{}-{}-nb-SG'.format(edge_conf['service_base_name'], - os.environ['edge_user_name']) - edge_conf['private_subnet_prefix'] = os.environ['aws_private_subnet_prefix'] - edge_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(edge_conf['service_base_name'], - os.environ['edge_user_name']) - edge_conf['dataengine_master_security_group_name'] = '{}-{}-dataengine-master-sg' \ - .format(edge_conf['service_base_name'], os.environ['edge_user_name']) - edge_conf['dataengine_slave_security_group_name'] = '{}-{}-dataengine-slave-sg' \ - .format(edge_conf['service_base_name'], os.environ['edge_user_name']) - edge_conf['allowed_ip_cidr'] = list() - for cidr in os.environ['conf_allowed_ip_cidr'].split(','): - edge_conf['allowed_ip_cidr'].append({"CidrIp": cidr.replace(' ','')}) - edge_conf['network_type'] = os.environ['conf_network_type'] - edge_conf['all_ip_cidr'] = '0.0.0.0/0' - edge_conf['zone'] = os.environ['aws_region'] + os.environ['aws_zone'] - edge_conf['elastic_ip_name'] = '{0}-{1}-edge-EIP'.format(edge_conf['service_base_name'], - os.environ['edge_user_name']) - if 'aws_user_predefined_s3_policies' not in os.environ: - os.environ['aws_user_predefined_s3_policies'] = 'None' - - try: - if os.environ['conf_user_subnets_range'] == '': - raise KeyError - except KeyError: - os.environ['conf_user_subnets_range'] = '' - - # FUSE in case of absence of user's key - fname = "{}{}.pub".format(os.environ['conf_key_dir'], edge_conf['user_keyname']) - if not os.path.isfile(fname): - print("USERs PUBLIC KEY DOES NOT EXIST in {}".format(fname)) - sys.exit(1) - - print("Will create exploratory environment with edge node as access point as following: {}". - format(json.dumps(edge_conf, sort_keys=True, indent=4, separators=(',', ': ')))) - logging.info(json.dumps(edge_conf)) - - try: - logging.info('[CREATE SUBNET]') - print('[CREATE SUBNET]') - params = "--vpc_id '{}' --infra_tag_name {} --infra_tag_value {} --username {} --prefix {} " \ - "--user_subnets_range '{}' --subnet_name {} --zone {}".format( - edge_conf['vpc2_id'], edge_conf['tag_name'], edge_conf['service_base_name'], os.environ['edge_user_name'], - edge_conf['private_subnet_prefix'], os.environ['conf_user_subnets_range'], edge_conf['private_subnet_name'], - edge_conf['zone']) - try: - local("~/scripts/{}.py {}".format('common_create_subnet', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create subnet.", str(err)) - sys.exit(1) - - tag = {"Key": edge_conf['tag_name'], "Value": "{}-{}-subnet".format(edge_conf['service_base_name'], - os.environ['edge_user_name'])} - edge_conf['private_subnet_cidr'] = get_subnet_by_tag(tag) - print('NEW SUBNET CIDR CREATED: {}'.format(edge_conf['private_subnet_cidr'])) - - try: - logging.info('[CREATE EDGE ROLES]') - print('[CREATE EDGE ROLES]') - params = "--role_name {} --role_profile_name {} --policy_name {} --region {} --infra_tag_name {} " \ - "--infra_tag_value {}" \ - .format(edge_conf['role_name'], edge_conf['role_profile_name'], - edge_conf['policy_name'], os.environ['aws_region'], edge_conf['tag_name'], - edge_conf['service_base_name']) - try: - local("~/scripts/{}.py {}".format('common_create_role_policy', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to creating roles.", str(err)) - sys.exit(1) - - try: - logging.info('[CREATE BACKEND (NOTEBOOK) ROLES]') - print('[CREATE BACKEND (NOTEBOOK) ROLES]') - params = "--role_name {} --role_profile_name {} --policy_name {} --region {} --infra_tag_name {} " \ - "--infra_tag_value {}" \ - .format(edge_conf['notebook_dataengine_role_name'], edge_conf['notebook_dataengine_role_profile_name'], - edge_conf['notebook_dataengine_policy_name'], os.environ['aws_region'], edge_conf['tag_name'], - edge_conf['service_base_name']) - try: - local("~/scripts/{}.py {}".format('common_create_role_policy', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to creating roles.", str(err)) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - sys.exit(1) - - try: - logging.info('[CREATE SECURITY GROUP FOR EDGE NODE]') - print('[CREATE SECURITY GROUPS FOR EDGE]') - edge_sg_ingress = format_sg([ - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "UserIdGroupPairs": [], "PrefixListIds": [] - }, - { - "PrefixListIds": [], - "FromPort": 22, - "IpRanges": edge_conf['allowed_ip_cidr'], - "ToPort": 22, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 3128, - "IpRanges": edge_conf['allowed_ip_cidr'], - "ToPort": 3128, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 80, - "IpRanges": edge_conf['allowed_ip_cidr'], - "ToPort": 80, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": get_instance_ip_address(edge_conf['tag_name'], '{}-ssn'.format( - edge_conf['service_base_name'])).get('Private') + "/32"}], - "UserIdGroupPairs": [], - "PrefixListIds": [] - } - ]) - edge_sg_egress = format_sg([ - { - "PrefixListIds": [], - "FromPort": 22, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 22, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8888, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 8888, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8080, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 8080, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8787, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 8787, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 6006, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 6006, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 20888, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 20888, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8042, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 8042, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8088, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 8088, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8081, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 8081, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 4040, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 4140, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 18080, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 18080, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 50070, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 50070, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 53, - "IpRanges": [{"CidrIp": edge_conf['all_ip_cidr']}], - "ToPort": 53, "IpProtocol": "udp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 80, - "IpRanges": [{"CidrIp": edge_conf['all_ip_cidr']}], - "ToPort": 80, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 123, - "IpRanges": [{"CidrIp": edge_conf['all_ip_cidr']}], - "ToPort": 123, "IpProtocol": "udp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 443, - "IpRanges": [{"CidrIp": edge_conf['all_ip_cidr']}], - "ToPort": 443, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8085, - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "ToPort": 8085, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 389, - "IpRanges": [{"CidrIp": edge_conf['all_ip_cidr']}], - "ToPort": 389, "IpProtocol": "tcp", "UserIdGroupPairs": [] - } - ]) - params = "--name {} --vpc_id {} --security_group_rules '{}' --infra_tag_name {} --infra_tag_value {} \ - --egress '{}' --force {} --nb_sg_name {} --resource {}".\ - format(edge_conf['edge_security_group_name'], edge_conf['vpc_id'], json.dumps(edge_sg_ingress), - edge_conf['service_base_name'], edge_conf['instance_name'], json.dumps(edge_sg_egress), - True, edge_conf['notebook_instance_name'], 'edge') - try: - local("~/scripts/{}.py {}".format('common_create_security_group', params)) - except Exception as err: - traceback.print_exc() - append_result("Failed creating security group for edge node.", str(err)) - raise Exception - - with hide('stderr', 'running', 'warnings'): - print('Waiting for changes to propagate') - time.sleep(10) - except: - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - sys.exit(1) - - try: - logging.info('[CREATE SECURITY GROUP FOR PRIVATE SUBNET]') - print('[CREATE SECURITY GROUP FOR PRIVATE SUBNET]') - edge_group_id = check_security_group(edge_conf['edge_security_group_name']) - sg_list = edge_conf['sg_ids'].replace(" ", "").split(',') - rules_list = [] - for i in sg_list: - rules_list.append({"GroupId": i}) - private_sg_ingress = format_sg([ - { - "IpProtocol": "-1", - "IpRanges": [], - "UserIdGroupPairs": [{"GroupId": edge_group_id}], - "PrefixListIds": [] - }, - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "UserIdGroupPairs": [], - "PrefixListIds": [] - }, - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": get_instance_ip_address(edge_conf['tag_name'], '{}-ssn'.format( - edge_conf['service_base_name'])).get('Private') + "/32"}], - "UserIdGroupPairs": [], - "PrefixListIds": [] - } - ]) - - private_sg_egress = format_sg([ - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": edge_conf['private_subnet_cidr']}], - "UserIdGroupPairs": [], - "PrefixListIds": [] - }, - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": get_instance_ip_address(edge_conf['tag_name'], '{}-ssn'.format( - edge_conf['service_base_name'])).get('Private') + "/32"}], - "UserIdGroupPairs": [], - "PrefixListIds": [], - }, - { - "IpProtocol": "-1", - "IpRanges": [], - "UserIdGroupPairs": [{"GroupId": edge_group_id}], - "PrefixListIds": [] - }, - { - "IpProtocol": "tcp", - "IpRanges": [{"CidrIp": edge_conf['all_ip_cidr']}], - "FromPort": 443, - "ToPort": 443, - "UserIdGroupPairs": [], - "PrefixListIds": [], - } - ]) - - params = "--name {} --vpc_id {} --security_group_rules '{}' --egress '{}' --infra_tag_name {} " \ - "--infra_tag_value {} --force {}".format(edge_conf['notebook_security_group_name'], - edge_conf['vpc2_id'], json.dumps(private_sg_ingress), - json.dumps(private_sg_egress), edge_conf['service_base_name'], - edge_conf['notebook_instance_name'], True) - try: - local("~/scripts/{}.py {}".format('common_create_security_group', params)) - except: - traceback.print_exc() - raise Exception - - with hide('stderr', 'running', 'warnings'): - print('Waiting for changes to propagate') - time.sleep(10) - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed creating security group for private subnet.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['instance_name']) - sys.exit(1) - - logging.info('[CREATING SECURITY GROUPS FOR MASTER NODE]') - print("[CREATING SECURITY GROUPS FOR MASTER NODE]") - try: - params = "--name {} --vpc_id {} --security_group_rules '{}' --egress '{}' --infra_tag_name {} " \ - "--infra_tag_value {} --force {}".format(edge_conf['dataengine_master_security_group_name'], - edge_conf['vpc2_id'], json.dumps(private_sg_ingress), - json.dumps(private_sg_egress), edge_conf['service_base_name'], - edge_conf['dataengine_instances_name'], True) - try: - local("~/scripts/{}.py {}".format('common_create_security_group', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create sg.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['instance_name']) - sys.exit(1) - - logging.info('[CREATING SECURITY GROUPS FOR SLAVE NODES]') - print("[CREATING SECURITY GROUPS FOR SLAVE NODES]") - try: - params = "--name {} --vpc_id {} --security_group_rules '{}' --egress '{}' --infra_tag_name {} " \ - "--infra_tag_value {} --force {}".format(edge_conf['dataengine_slave_security_group_name'], - edge_conf['vpc2_id'], json.dumps(private_sg_ingress), - json.dumps(private_sg_egress), edge_conf['service_base_name'], - edge_conf['dataengine_instances_name'], True) - try: - local("~/scripts/{}.py {}".format('common_create_security_group', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create bucket.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['dataengine_instances_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['instance_name']) - sys.exit(1) - - try: - logging.info('[CREATE BUCKETS]') - print('[CREATE BUCKETS]') - params = "--bucket_name {} --infra_tag_name {} --infra_tag_value {} --region {} --bucket_name_tag {}" \ - .format(edge_conf['bucket_name'], edge_conf['tag_name'], edge_conf['bucket_name'], - edge_conf['region'], edge_conf['bucket_name_tag']) - try: - local("~/scripts/{}.py {}".format('common_create_bucket', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create bucket.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['dataengine_instances_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['instance_name']) - sys.exit(1) - - try: - logging.info('[CREATING BUCKET POLICY FOR USER INSTANCES]') - print('[CREATING BUCKET POLICY FOR USER INSTANCES]') - params = '--bucket_name {} --ssn_bucket_name {} --shared_bucket_name {} --username {} --edge_role_name {} ' \ - '--notebook_role_name {} --service_base_name {} --region {} ' \ - '--user_predefined_s3_policies "{}"'.format(edge_conf['bucket_name'], edge_conf['ssn_bucket_name'], - edge_conf['shared_bucket_name'], - os.environ['edge_user_name'], edge_conf['role_name'], - edge_conf['notebook_dataengine_role_name'], - edge_conf['service_base_name'], edge_conf['region'], - os.environ['aws_user_predefined_s3_policies']) - try: - local("~/scripts/{}.py {}".format('common_create_policy', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create bucket policy.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['dataengine_instances_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['instance_name']) - remove_s3('edge', os.environ['edge_user_name']) - sys.exit(1) - - try: - logging.info('[CREATE EDGE INSTANCE]') - print('[CREATE EDGE INSTANCE]') - params = "--node_name {} --ami_id {} --instance_type {} --key_name {} --security_group_ids {} " \ - "--subnet_id {} --iam_profile {} --infra_tag_name {} --infra_tag_value {}" \ - .format(edge_conf['instance_name'], edge_conf['ami_id'], edge_conf['instance_size'], edge_conf['key_name'], - edge_group_id, edge_conf['public_subnet_id'], edge_conf['role_profile_name'], - edge_conf['tag_name'], edge_conf['instance_name']) - try: - local("~/scripts/{}.py {}".format('common_create_instance', params)) - except: - traceback.print_exc() - raise Exception - - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create instance.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['dataengine_instances_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['instance_name']) - remove_s3('edge', os.environ['edge_user_name']) - sys.exit(1) - - if edge_conf['network_type'] == 'public': - try: - logging.info('[ASSOCIATING ELASTIC IP]') - print('[ASSOCIATING ELASTIC IP]') - edge_conf['edge_id'] = get_instance_by_name(edge_conf['tag_name'], edge_conf['instance_name']) - try: - edge_conf['elastic_ip'] = os.environ['edge_elastic_ip'] - except: - edge_conf['elastic_ip'] = 'None' - params = "--elastic_ip {} --edge_id {} --infra_tag_name {} --infra_tag_value {}".format( - edge_conf['elastic_ip'], edge_conf['edge_id'], edge_conf['tag_name'], edge_conf['elastic_ip_name']) - try: - local("~/scripts/{}.py {}".format('edge_associate_elastic_ip', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to associate elastic ip.", str(err)) - try: - edge_conf['edge_public_ip'] = get_instance_ip_address(edge_conf['tag_name'], - edge_conf['instance_name']).get('Public') - edge_conf['allocation_id'] = get_allocation_id_by_elastic_ip(edge_conf['edge_public_ip']) - except: - print("No Elastic IPs to release!") - remove_ec2(edge_conf['tag_name'], edge_conf['instance_name']) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['dataengine_instances_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['instance_name']) - remove_s3('edge', os.environ['edge_user_name']) - sys.exit(1) diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_start.py b/infrastructure-provisioning/src/general/scripts/aws/edge_start.py index c7285915e4..5c43ff4d85 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_start.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_start.py @@ -27,7 +27,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -39,7 +39,7 @@ print('Generating infrastructure names and tags') edge_conf = dict() edge_conf['service_base_name'] = os.environ['conf_service_base_name'] - edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_conf['tag_name'] = edge_conf['service_base_name'] + '-Tag' logging.info('[START EDGE]') diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_status.py b/infrastructure-provisioning/src/general/scripts/aws/edge_status.py index 86ff6e326e..e302bdc721 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_status.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_status.py @@ -30,7 +30,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/edge/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_stop.py b/infrastructure-provisioning/src/general/scripts/aws/edge_stop.py index dd52ff938d..911046cc8b 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_stop.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_stop.py @@ -27,7 +27,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -39,7 +39,7 @@ print('Generating infrastructure names and tags') edge_conf = dict() edge_conf['service_base_name'] = os.environ['conf_service_base_name'] - edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_conf['tag_name'] = edge_conf['service_base_name'] + '-Tag' logging.info('[STOP EDGE]') diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_terminate.py b/infrastructure-provisioning/src/general/scripts/aws/edge_terminate.py deleted file mode 100644 index 26be0b8c6d..0000000000 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_terminate.py +++ /dev/null @@ -1,129 +0,0 @@ -#!/usr/bin/python - -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -import json -from dlab.fab import * -from dlab.meta_lib import * -import sys, time, os -from dlab.actions_lib import * - - -def terminate_edge_node(tag_name, user_name, tag_value, nb_sg, edge_sg, de_sg, emr_sg): - print('Terminating EMR cluster') - try: - clusters_list = get_emr_list(tag_name) - if clusters_list: - for cluster_id in clusters_list: - client = boto3.client('emr') - cluster = client.describe_cluster(ClusterId=cluster_id) - cluster = cluster.get("Cluster") - emr_name = cluster.get('Name') - if '{}'.format(tag_value[:-1]) in emr_name: - terminate_emr(cluster_id) - print("The EMR cluster {} has been terminated successfully".format(emr_name)) - else: - print("There are no EMR clusters to terminate.") - except Exception as err: - print('Error: {0}'.format(err)) - sys.exit(1) - - print("Terminating EDGE and notebook instances") - try: - remove_ec2(tag_name, tag_value) - except: - sys.exit(1) - - print("Removing s3 bucket") - try: - remove_s3('edge', user_name) - except: - sys.exit(1) - - print("Removing IAM roles and profiles") - try: - remove_all_iam_resources('notebook', user_name) - remove_all_iam_resources('edge', user_name) - except: - sys.exit(1) - - print("Removing security groups") - try: - remove_sgroups(emr_sg) - remove_sgroups(de_sg) - remove_sgroups(nb_sg) - remove_sgroups(edge_sg) - except: - sys.exit(1) - - print("Removing private subnet") - try: - remove_subnets(tag_value) - except: - sys.exit(1) - - -if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - # generating variables dictionary - create_aws_config_files() - print('Generating infrastructure names and tags') - edge_conf = dict() - edge_conf['service_base_name'] = os.environ['conf_service_base_name'] - edge_conf['user_name'] = os.environ['edge_user_name'] - edge_conf['tag_name'] = edge_conf['service_base_name'] + '-Tag' - edge_conf['tag_value'] = edge_conf['service_base_name'] + "-" + os.environ['edge_user_name'] + '-*' - edge_conf['edge_sg'] = edge_conf['service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' - edge_conf['nb_sg'] = edge_conf['service_base_name'] + "-" + os.environ['edge_user_name'] + '-nb' - edge_conf['edge_instance_name'] = edge_conf['service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' - edge_conf['de_sg'] = edge_conf['service_base_name'] + "-" + edge_conf['user_name'] + \ - '-dataengine*' - edge_conf['emr_sg'] = edge_conf['service_base_name'] + "-" + edge_conf['user_name'] + '-des-*' - - try: - logging.info('[TERMINATE EDGE]') - print('[TERMINATE EDGE]') - try: - terminate_edge_node(edge_conf['tag_name'], edge_conf['user_name'], edge_conf['tag_value'], - edge_conf['nb_sg'], edge_conf['edge_sg'], edge_conf['de_sg'], edge_conf['emr_sg']) - except Exception as err: - traceback.print_exc() - append_result("Failed to terminate edge.", str(err)) - except Exception as err: - print('Error: {0}'.format(err)) - sys.exit(1) - - try: - with open("/root/result.json", 'w') as result: - res = {"service_base_name": edge_conf['service_base_name'], - "user_name": edge_conf['user_name'], - "Action": "Terminate edge node"} - print(json.dumps(res)) - result.write(json.dumps(res)) - except: - print("Failed writing results.") - sys.exit(0) \ No newline at end of file diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py index 2b390b3b32..91f0871f96 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py @@ -36,7 +36,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -51,18 +51,18 @@ notebook_config['service_base_name'] = os.environ['conf_service_base_name'] notebook_config['instance_type'] = os.environ['aws_notebook_instance_type'] notebook_config['key_name'] = os.environ['conf_key_name'] - notebook_config['user_keyname'] = os.environ['edge_user_name'] + notebook_config['user_keyname'] = os.environ['project_name'] notebook_config['network_type'] = os.environ['conf_network_type'] notebook_config['instance_name'] = '{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], notebook_config['exploratory_name'], args.uuid) notebook_config['expected_image_name'] = '{}-{}-notebook-image'.format(notebook_config['service_base_name'], os.environ['application']) notebook_config['notebook_image_name'] = str(os.environ.get('notebook_image_name')) notebook_config['role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) + .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['project_name']) notebook_config['security_group_name'] = '{}-{}-nb-SG'.format(notebook_config['service_base_name'], - os.environ['edge_user_name']) + os.environ['project_name']) notebook_config['tag_name'] = '{}-Tag'.format(notebook_config['service_base_name']) notebook_config['dlab_ssh_user'] = os.environ['conf_os_user'] notebook_config['shared_image_enabled'] = os.environ['conf_shared_image_enabled'] @@ -70,7 +70,7 @@ # generating variables regarding EDGE proxy on Notebook instance instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) - edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_instance_hostname = get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') if notebook_config['network_type'] == 'private': diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py index 937ca5bef4..9af6935ce4 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py +++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py @@ -45,7 +45,7 @@ parser.add_argument('--hadoop_version', type=str, default='') parser.add_argument('--region', type=str, default='') parser.add_argument('--excluded_lines', type=str, default='') -parser.add_argument('--user_name', type=str, default='') +parser.add_argument('--project_name', type=str, default='') parser.add_argument('--os_user', type=str, default='') parser.add_argument('--pip_mirror', type=str, default='') parser.add_argument('--numpy_version', type=str, default='') @@ -175,7 +175,7 @@ def add_breeze_library_emr(args): yarn(args, yarn_dir) install_emr_spark(args) pyspark_kernel(kernels_dir, args.emr_version, args.cluster_name, args.spark_version, args.bucket, - args.user_name, args.region, args.os_user, args.application, args.pip_mirror, args.numpy_version) + args.project_name, args.region, args.os_user, args.application, args.pip_mirror, args.numpy_version) toree_kernel(args) if args.r_enabled == 'true': r_kernel(args) diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_install_dataengine-service_kernels.py index 294f9d2036..6900a6a4b1 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_install_dataengine-service_kernels.py +++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_install_dataengine-service_kernels.py @@ -37,7 +37,7 @@ parser.add_argument('--notebook_ip', type=str, default='') parser.add_argument('--scala_version', type=str, default='') parser.add_argument('--emr_excluded_spark_properties', type=str, default='') -parser.add_argument('--edge_user_name', type=str, default='') +parser.add_argument('--project_name', type=str, default='') parser.add_argument('--os_user', type=str, default='') parser.add_argument('--edge_hostname', type=str, default='') parser.add_argument('--proxy_port', type=str, default='') @@ -82,5 +82,5 @@ def configure_notebook(args): sudo("/usr/bin/python /usr/local/bin/jupyter_dataengine-service_create_configs.py --bucket " + args.bucket + " --cluster_name " + args.cluster_name + " --emr_version " + args.emr_version + " --spark_version " + spark_version + " --hadoop_version " + hadoop_version + " --region " + args.region + " --excluded_lines '" - + args.emr_excluded_spark_properties + "' --user_name " + args.edge_user_name + " --os_user " + args.os_user + + + args.emr_excluded_spark_properties + "' --project_name " + args.project_name + " --os_user " + args.os_user + " --pip_mirror " + args.pip_mirror + " --numpy_version " + numpy_version + " --application " + args.application + " --r_enabled " + r_enabled) diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py index ae135a0868..5c0d75af59 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py @@ -448,10 +448,10 @@ except Exception as err: print('Error: {0}'.format(err)) append_result("Failed to create sg.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['edge_instance_name']) + remove_all_iam_resources('notebook', os.environ['project_name']) + remove_all_iam_resources('edge', os.environ['project_name']) + remove_sgroups(project_conf['notebook_instance_name']) + remove_sgroups(project_conf['edge_instance_name']) sys.exit(1) logging.info('[CREATING SECURITY GROUPS FOR SLAVE NODES]') @@ -470,11 +470,11 @@ except Exception as err: print('Error: {0}'.format(err)) append_result("Failed to create bucket.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['dataengine_instances_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['edge_instance_name']) + remove_all_iam_resources('notebook', os.environ['project_name']) + remove_all_iam_resources('edge', os.environ['project_name']) + remove_sgroups(project_conf['dataengine_instances_name']) + remove_sgroups(project_conf['notebook_instance_name']) + remove_sgroups(project_conf['edge_instance_name']) sys.exit(1) try: @@ -485,21 +485,23 @@ project_conf['region'], project_conf['bucket_name_tag']) try: local("~/scripts/{}.py {}".format('common_create_bucket', params)) + bucket = get_bucket_by_name(project_conf['bucket_name']) + create_tag(bucket, project_tag) except: traceback.print_exc() raise Exception except Exception as err: print('Error: {0}'.format(err)) append_result("Failed to create bucket.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) + remove_all_iam_resources('notebook', os.environ['project_name']) + remove_all_iam_resources('edge', os.environ['project_name']) remove_sgroups(project_conf['dataengine_instances_name']) remove_sgroups(project_conf['notebook_instance_name']) remove_sgroups(project_conf['edge_instance_name']) sys.exit(1) try: - logging.info('[CREATING BUCKET POLICY FOR USER INSTANCES]') + logging.info('[CREATING BUCKET POLICY FOR PROJECT INSTANCES]') print('[CREATING BUCKET POLICY FOR USER INSTANCES]') params = '--bucket_name {} --ssn_bucket_name {} --shared_bucket_name {} --username {} --edge_role_name {} ' \ '--notebook_role_name {} --service_base_name {} --region {} ' \ @@ -535,6 +537,8 @@ project_conf['tag_name'], project_conf['edge_instance_name']) try: local("~/scripts/{}.py {}".format('common_create_instance', params)) + edge_instance = get_instance_by_name(project_conf['tag_name'], project_conf['edge_instance_name']) + create_tag(edge_instance, project_tag) except: traceback.print_exc() raise Exception diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py index 369a475a91..a27ef9095b 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py @@ -28,7 +28,7 @@ from dlab.actions_lib import * -def terminate_edge_node(tag_name, user_name, tag_value, nb_sg, edge_sg, de_sg, emr_sg): +def terminate_edge_node(tag_name, project_tag, tag_value, nb_sg, edge_sg, de_sg, emr_sg): print('Terminating EMR cluster') try: clusters_list = get_emr_list(tag_name) @@ -55,14 +55,14 @@ def terminate_edge_node(tag_name, user_name, tag_value, nb_sg, edge_sg, de_sg, e print("Removing s3 bucket") try: - remove_s3('edge', user_name) + remove_s3('edge', project_name) except: sys.exit(1) print("Removing IAM roles and profiles") try: - remove_all_iam_resources('notebook', user_name) - remove_all_iam_resources('edge', user_name) + remove_all_iam_resources('notebook', project_tag) + remove_all_iam_resources('edge', project_tag) except: sys.exit(1) diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py index e0b046c5ed..b49ca4cc59 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py @@ -37,7 +37,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -52,18 +52,18 @@ notebook_config['service_base_name'] = os.environ['conf_service_base_name'] notebook_config['instance_type'] = os.environ['aws_notebook_instance_type'] notebook_config['key_name'] = os.environ['conf_key_name'] - notebook_config['user_keyname'] = os.environ['edge_user_name'] + notebook_config['user_keyname'] = os.environ['project_name'] notebook_config['network_type'] = os.environ['conf_network_type'] notebook_config['instance_name'] = '{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], notebook_config['exploratory_name'], args.uuid) notebook_config['expected_image_name'] = '{}-{}-notebook-image'.format(notebook_config['service_base_name'], os.environ['application']) notebook_config['notebook_image_name'] = str(os.environ.get('notebook_image_name')) notebook_config['role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) + .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['project_name']) notebook_config['security_group_name'] = '{}-{}-nb-SG'.format(notebook_config['service_base_name'], - os.environ['edge_user_name']) + os.environ['project_name']) notebook_config['tag_name'] = '{}-Tag'.format(notebook_config['service_base_name']) notebook_config['rstudio_pass'] = id_generator() notebook_config['dlab_ssh_user'] = os.environ['conf_os_user'] @@ -72,7 +72,7 @@ # generating variables regarding EDGE proxy on Notebook instance instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) - edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_instance_hostname = get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') if notebook_config['network_type'] == 'private': diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_dataengine-service_create_configs.py index 5534b734a6..f82c0f0ef8 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_dataengine-service_create_configs.py +++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_dataengine-service_create_configs.py @@ -45,7 +45,7 @@ parser.add_argument('--hadoop_version', type=str, default='') parser.add_argument('--region', type=str, default='') parser.add_argument('--excluded_lines', type=str, default='') -parser.add_argument('--user_name', type=str, default='') +parser.add_argument('--project_name', type=str, default='') parser.add_argument('--os_user', type=str, default='') args = parser.parse_args() diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_install_dataengine-service_kernels.py index 93f8bfcfa7..4393b219d3 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_install_dataengine-service_kernels.py +++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_install_dataengine-service_kernels.py @@ -37,7 +37,7 @@ parser.add_argument('--notebook_ip', type=str, default='') parser.add_argument('--scala_version', type=str, default='') parser.add_argument('--emr_excluded_spark_properties', type=str, default='') -parser.add_argument('--edge_user_name', type=str, default='') +parser.add_argument('--project_name', type=str, default='') parser.add_argument('--os_user', type=str, default='') parser.add_argument('--edge_hostname', type=str, default='') parser.add_argument('--proxy_port', type=str, default='') @@ -72,4 +72,4 @@ def configure_notebook(args): sudo("/usr/bin/python /usr/local/bin/rstudio_dataengine-service_create_configs.py --bucket " + args.bucket + " --cluster_name " + args.cluster_name + " --emr_version " + args.emr_version + " --spark_version " + spark_version + " --hadoop_version " + hadoop_version + " --region " + args.region + " --excluded_lines '" - + args.emr_excluded_spark_properties + "' --user_name " + args.edge_user_name + " --os_user " + args.os_user) + + args.emr_excluded_spark_properties + "' --project_name " + args.project_name + " --os_user " + args.os_user) diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py index 96b4cc35d9..420ba9e9fb 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py @@ -38,7 +38,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -53,31 +53,31 @@ notebook_config['service_base_name'] = os.environ['conf_service_base_name'] notebook_config['instance_type'] = os.environ['aws_notebook_instance_type'] notebook_config['key_name'] = os.environ['conf_key_name'] - notebook_config['user_keyname'] = os.environ['edge_user_name'] + notebook_config['user_keyname'] = os.environ['project_name'] notebook_config['network_type'] = os.environ['conf_network_type'] notebook_config['instance_name'] = '{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], notebook_config['exploratory_name'], args.uuid) notebook_config['expected_image_name'] = '{}-{}-notebook-image'.format(notebook_config['service_base_name'], os.environ['application']) notebook_config['notebook_image_name'] = str(os.environ.get('notebook_image_name')) notebook_config['role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) + .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['project_name']) notebook_config['security_group_name'] = '{}-{}-nb-SG'.format(notebook_config['service_base_name'], - os.environ['edge_user_name']) + os.environ['project_name']) notebook_config['tag_name'] = '{}-Tag'.format(notebook_config['service_base_name']) notebook_config['dlab_ssh_user'] = os.environ['conf_os_user'] notebook_config['shared_image_enabled'] = os.environ['conf_shared_image_enabled'] notebook_config['ip_address'] = get_instance_ip_address(notebook_config['tag_name'], notebook_config['instance_name']).get('Private') tag = {"Key": notebook_config['tag_name'], - "Value": "{}-{}-subnet".format(notebook_config['service_base_name'], os.environ['edge_user_name'])} + "Value": "{}-{}-subnet".format(notebook_config['service_base_name'], os.environ['project_name'])} notebook_config['subnet_cidr'] = get_subnet_by_tag(tag) notebook_config['rstudio_pass'] = id_generator() # generating variables regarding EDGE proxy on Notebook instance instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) - edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_instance_hostname = get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') if notebook_config['network_type'] == 'private': diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py index 1230ce11c4..0f68666d0c 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py @@ -38,7 +38,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -53,29 +53,29 @@ notebook_config['service_base_name'] = os.environ['conf_service_base_name'] notebook_config['instance_type'] = os.environ['aws_notebook_instance_type'] notebook_config['key_name'] = os.environ['conf_key_name'] - notebook_config['user_keyname'] = os.environ['edge_user_name'] + notebook_config['user_keyname'] = os.environ['project_name'] notebook_config['network_type'] = os.environ['conf_network_type'] notebook_config['instance_name'] = '{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], notebook_config['exploratory_name'], args.uuid) notebook_config['expected_image_name'] = '{}-{}-notebook-image'.format(notebook_config['service_base_name'], os.environ['application']) notebook_config['notebook_image_name'] = str(os.environ.get('notebook_image_name')) notebook_config['role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) + .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['project_name']) notebook_config['security_group_name'] = '{}-{}-nb-SG'.format(notebook_config['service_base_name'], - os.environ['edge_user_name']) + os.environ['project_name']) notebook_config['tag_name'] = '{}-Tag'.format(notebook_config['service_base_name']) notebook_config['dlab_ssh_user'] = os.environ['conf_os_user'] notebook_config['shared_image_enabled'] = os.environ['conf_shared_image_enabled'] tag = {"Key": notebook_config['tag_name'], - "Value": "{}-{}-subnet".format(notebook_config['service_base_name'], os.environ['edge_user_name'])} + "Value": "{}-{}-subnet".format(notebook_config['service_base_name'], os.environ['project_name'])} notebook_config['subnet_cidr'] = get_subnet_by_tag(tag) notebook_config['ip_address'] = get_instance_ip_address(notebook_config['tag_name'], notebook_config['instance_name']).get('Private') # generating variables regarding EDGE proxy on Notebook instance instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) - edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_instance_hostname = get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') if notebook_config['network_type'] == 'private': diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py index b59cf37691..60c71adb6b 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py @@ -38,7 +38,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -53,18 +53,18 @@ notebook_config['service_base_name'] = os.environ['conf_service_base_name'] notebook_config['instance_type'] = os.environ['aws_notebook_instance_type'] notebook_config['key_name'] = os.environ['conf_key_name'] - notebook_config['user_keyname'] = os.environ['edge_user_name'] + notebook_config['user_keyname'] = os.environ['project_name'] notebook_config['network_type'] = os.environ['conf_network_type'] notebook_config['instance_name'] = '{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], notebook_config['exploratory_name'], args.uuid) notebook_config['expected_image_name'] = '{}-{}-notebook-image'.format(notebook_config['service_base_name'], os.environ['application']) notebook_config['notebook_image_name'] = str(os.environ.get('notebook_image_name')) notebook_config['role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['edge_user_name']) + .format(notebook_config['service_base_name'].lower().replace('-', '_'), os.environ['project_name']) notebook_config['security_group_name'] = '{}-{}-nb-SG'.format(notebook_config['service_base_name'], - os.environ['edge_user_name']) + os.environ['project_name']) notebook_config['tag_name'] = '{}-Tag'.format(notebook_config['service_base_name']) notebook_config['dlab_ssh_user'] = os.environ['conf_os_user'] notebook_config['shared_image_enabled'] = os.environ['conf_shared_image_enabled'] @@ -80,7 +80,7 @@ # generating variables regarding EDGE proxy on Notebook instance instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) - edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['edge_user_name'] + '-edge' + edge_instance_name = os.environ['conf_service_base_name'] + "-" + os.environ['project_name'] + '-edge' edge_instance_hostname = get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') if notebook_config['network_type'] == 'private': diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_dataengine-service_create_configs.py index ea72a0abee..bc452fc3b1 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_dataengine-service_create_configs.py +++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_dataengine-service_create_configs.py @@ -46,7 +46,7 @@ parser.add_argument('--hadoop_version', type=str, default='') parser.add_argument('--region', type=str, default='') parser.add_argument('--excluded_lines', type=str, default='') -parser.add_argument('--user_name', type=str, default='') +parser.add_argument('--project_name', type=str, default='') parser.add_argument('--os_user', type=str, default='') parser.add_argument('--edge_hostname', type=str, default='') parser.add_argument('--proxy_port', type=str, default='') @@ -100,8 +100,8 @@ def install_remote_livy(args): configuring_notebook(args.emr_version) if args.multiple_clusters == 'true': install_remote_livy(args) - installing_python(args.region, args.bucket, args.user_name, args.cluster_name, args.application, + installing_python(args.region, args.bucket, args.project_name, args.cluster_name, args.application, args.pip_mirror, args.numpy_version) configure_zeppelin_emr_interpreter(args.emr_version, args.cluster_name, args.region, spark_dir, args.os_user, - yarn_dir, args.bucket, args.user_name, endpoint_url, args.multiple_clusters) + yarn_dir, args.bucket, args.project_name, endpoint_url, args.multiple_clusters) update_zeppelin_interpreters(args.multiple_clusters, args.r_enabled) diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_install_dataengine-service_kernels.py index cbdff4d3d9..7a042967b0 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_install_dataengine-service_kernels.py +++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_install_dataengine-service_kernels.py @@ -37,7 +37,7 @@ parser.add_argument('--notebook_ip', type=str, default='') parser.add_argument('--scala_version', type=str, default='') parser.add_argument('--emr_excluded_spark_properties', type=str, default='') -parser.add_argument('--edge_user_name', type=str, default='') +parser.add_argument('--project_name', type=str, default='') parser.add_argument('--os_user', type=str, default='') parser.add_argument('--edge_hostname', type=str, default='') parser.add_argument('--proxy_port', type=str, default='') @@ -85,7 +85,7 @@ def configure_notebook(args): "--hadoop_version {4} " \ "--region {5} " \ "--excluded_lines '{6}' " \ - "--user_name {7} " \ + "--project_name {7} " \ "--os_user {8} " \ "--edge_hostname {9} " \ "--proxy_port {10} " \ @@ -103,7 +103,7 @@ def configure_notebook(args): hadoop_version, args.region, args.emr_excluded_spark_properties, - args.edge_user_name, + args.project_name, args.os_user, args.edge_hostname, args.proxy_port, From f63b4462a91b39b4f6517344f1c9f7dfdd3228f0 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 25 Jun 2019 12:43:47 +0300 Subject: [PATCH 213/357] project_name instead edge_user_name fixed in api and others --- .../src/edge/fabfile.py | 152 ----- .../src/edge/scripts/configure_http_proxy.py | 52 -- .../scripts/configure_nginx_reverse_proxy.py | 64 -- .../src/edge/scripts/reupload_ssh_key.py | 71 --- .../src/edge/templates/conf.d/proxy.conf | 28 - .../locations/dataengine-service.conf | 77 --- .../src/edge/templates/locations/jupyter.conf | 29 - .../src/edge/templates/locations/rstudio.conf | 30 - .../src/edge/templates/locations/spark.conf | 123 ---- .../src/edge/templates/locations/tensor.conf | 31 - .../src/edge/templates/locations/ungit.conf | 29 - .../edge/templates/locations/zeppelin.conf | 28 - .../src/edge/templates/nginx.conf | 64 -- .../src/edge/templates/nginx_debian | 216 ------- .../src/edge/templates/nginx_redhat | 128 ---- .../src/edge/templates/squid.conf | 62 -- .../src/general/api/check_inactivity.py | 4 +- .../src/general/api/configure.py | 4 +- .../src/general/api/create_image.py | 4 +- .../src/general/api/git_creds.py | 4 +- .../src/general/api/install_libs.py | 4 +- .../src/general/api/list_libs.py | 8 +- .../src/general/api/project_prepare_var.py | 585 ------------------ .../src/general/api/reconfigure_spark.py | 4 +- .../src/general/api/recreate.py | 4 +- .../src/general/api/reupload_key.py | 4 +- .../src/general/api/start.py | 4 +- .../src/general/api/status.py | 4 +- .../src/general/api/stop.py | 4 +- .../src/general/api/terminate_image.py | 4 +- .../src/general/files/aws/base_Dockerfile | 3 +- .../src/general/files/aws/edge_Dockerfile | 34 - .../general/files/aws/edge_description.json | 4 - .../src/general/lib/os/debian/edge_lib.py | 2 +- .../src/general/lib/os/redhat/edge_lib.py | 2 +- .../scripts/os/common_clean_instance.py | 4 +- .../scripts/os/dataengine_install_libs.py | 2 +- .../scripts/os/dataengine_list_libs.py | 2 +- .../os/dataengine_reconfigure_spark.py | 2 +- .../general/scripts/os/notebook_git_creds.py | 2 +- .../scripts/os/notebook_inactivity_check.py | 4 +- .../scripts/os/notebook_install_libs.py | 2 +- .../general/scripts/os/notebook_list_libs.py | 2 +- .../scripts/os/notebook_reconfigure_spark.py | 2 +- .../src/tensor/fabfile.py | 24 +- 45 files changed, 55 insertions(+), 1861 deletions(-) delete mode 100644 infrastructure-provisioning/src/edge/fabfile.py delete mode 100644 infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py delete mode 100644 infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py delete mode 100644 infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py delete mode 100644 infrastructure-provisioning/src/edge/templates/conf.d/proxy.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/locations/dataengine-service.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/locations/jupyter.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/locations/rstudio.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/locations/spark.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/locations/tensor.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/locations/ungit.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/locations/zeppelin.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/nginx.conf delete mode 100644 infrastructure-provisioning/src/edge/templates/nginx_debian delete mode 100644 infrastructure-provisioning/src/edge/templates/nginx_redhat delete mode 100644 infrastructure-provisioning/src/edge/templates/squid.conf delete mode 100644 infrastructure-provisioning/src/general/api/project_prepare_var.py delete mode 100644 infrastructure-provisioning/src/general/files/aws/edge_Dockerfile delete mode 100644 infrastructure-provisioning/src/general/files/aws/edge_description.json diff --git a/infrastructure-provisioning/src/edge/fabfile.py b/infrastructure-provisioning/src/edge/fabfile.py deleted file mode 100644 index 67001179e5..0000000000 --- a/infrastructure-provisioning/src/edge/fabfile.py +++ /dev/null @@ -1,152 +0,0 @@ -#!/usr/bin/python - -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -import json -from fabric.api import * -import logging -import sys -import os -from dlab.fab import * -import traceback - - -def status(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - try: - local("~/scripts/{}.py".format('edge_status')) - except Exception as err: - traceback.print_exc() - append_result("Failed obtaining EDGE status.", str(err)) - sys.exit(1) - - -def run(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - try: - local("~/scripts/{}.py".format('edge_prepare')) - except Exception as err: - traceback.print_exc() - append_result("Failed preparing Edge node.", str(err)) - sys.exit(1) - - try: - local("~/scripts/{}.py".format('edge_configure')) - except Exception as err: - traceback.print_exc() - append_result("Failed configuring Edge node.", str(err)) - sys.exit(1) - - -# Main function for terminating EDGE node and exploratory environment if exists -def terminate(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - try: - local("~/scripts/{}.py".format('edge_terminate')) - except Exception as err: - traceback.print_exc() - append_result("Failed terminating Edge node.", str(err)) - sys.exit(1) - - -# Main function for stopping EDGE node -def stop(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - try: - local("~/scripts/{}.py".format('edge_stop')) - except Exception as err: - traceback.print_exc() - append_result("Failed stopping Edge node.", str(err)) - sys.exit(1) - - -# Main function for stopping EDGE node -def start(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - try: - local("~/scripts/{}.py".format('edge_start')) - except Exception as err: - traceback.print_exc() - append_result("Failed starting Edge node.", str(err)) - sys.exit(1) - - -def recreate(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - try: - local("~/scripts/{}.py".format('edge_prepare')) - except Exception as err: - traceback.print_exc() - append_result("Failed preparing Edge node.", str(err)) - sys.exit(1) - - try: - local("~/scripts/{}.py".format('edge_configure')) - except Exception as err: - traceback.print_exc() - append_result("Failed configuring Edge node.", str(err)) - sys.exit(1) - - -def reupload_key(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - try: - local("~/scripts/{}.py".format('reupload_ssh_key')) - except Exception as err: - traceback.print_exc() - append_result("Failed to reupload key on Edge node.", str(err)) - sys.exit(1) \ No newline at end of file diff --git a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py deleted file mode 100644 index bad50ad1f5..0000000000 --- a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/python - -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -from fabric.api import * -from fabric.contrib.files import exists -from dlab.edge_lib import configure_http_proxy_server -import argparse -import json -import sys - -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('--additional_config', type=str, default='{"empty":"string"}') -args = parser.parse_args() - -############## -# Run script # -############## -if __name__ == "__main__": - print("Configure connections") - try: - env['connection_attempts'] = 100 - env.key_filename = [args.keyfile] - env.host_string = '{}@{}'.format(args.user, args.hostname) - deeper_config = json.loads(args.additional_config) - except: - sys.exit(2) - - print("Installing proxy for notebooks.") - configure_http_proxy_server(deeper_config) diff --git a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py deleted file mode 100644 index 7772c50e24..0000000000 --- a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/python - -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -import logging -from fabric.api import * -import argparse -import sys -import os -from dlab.edge_lib import install_nginx_ldap - -parser = argparse.ArgumentParser() -parser.add_argument('--hostname', type=str, default='') -parser.add_argument('--keyfile', type=str, default='') -parser.add_argument('--user', type=str, default='') -args = parser.parse_args() - -if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - print("Configure connections") - try: - env['connection_attempts'] = 100 - env.key_filename = [args.keyfile] - env.host_string = '{}@{}'.format(args.user, args.hostname) - except Exception as err: - print("Failed establish connection. Excpeption: " + 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'], os.environ['{}_iam_user'.format( - os.environ['conf_cloud_provider'])]) - except Exception as err: - print("Failed install nginx reverse proxy: " + str(err)) - sys.exit(1) - diff --git a/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py b/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py deleted file mode 100644 index b853af5955..0000000000 --- a/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/python - -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -import os -import sys -import logging -import traceback -from dlab.fab import * -from dlab.meta_lib import * -from dlab.actions_lib import * -from fabric.api import * -import multiprocessing - -if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - try: - if os.environ['conf_cloud_provider'] == 'aws': - create_aws_config_files() - logging.info('[REUPLOADING USER SSH KEY]') - print('[REUPLOADING USER SSH KEY]') - reupload_config = dict() - reupload_config['os_user'] = os.environ['conf_os_user'] - reupload_config['edge_user_name'] = os.environ['edge_user_name'] - reupload_config['keyfile'] = '{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) - reupload_config['resource_id'] = os.environ['resource_id'] - reupload_config['additional_config'] = {"user_keyname": reupload_config['edge_user_name'], - "user_keydir": os.environ['conf_key_dir']} - print(reupload_config) - try: - params = "--conf_resource {} --instance_id {} --os_user '{}'" \ - " --keyfile '{}' --additional_config '{}'".format( - os.environ['conf_resource'], reupload_config['resource_id'], - reupload_config['os_user'], reupload_config['keyfile'], - json.dumps(reupload_config['additional_config'])) - local("~/scripts/{}.py {}".format('common_reupload_key', params)) - except Exception as err: - traceback.print_exc() - raise Exception - except Exception as err: - append_result("Failed to reupload user ssh key.", str(err)) - sys.exit(1) - - with open("/root/result.json", 'w') as result: - res = {"Action": "Reupload user ssh key"} - result.write(json.dumps(res)) \ No newline at end of file diff --git a/infrastructure-provisioning/src/edge/templates/conf.d/proxy.conf b/infrastructure-provisioning/src/edge/templates/conf.d/proxy.conf deleted file mode 100644 index 3c4602977e..0000000000 --- a/infrastructure-provisioning/src/edge/templates/conf.d/proxy.conf +++ /dev/null @@ -1,28 +0,0 @@ -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** -server { - listen 80; - server_name EDGE_IP; - auth_ldap "Forbidden"; - auth_ldap_servers ldap1; - - include locations/*.conf; -} diff --git a/infrastructure-provisioning/src/edge/templates/locations/dataengine-service.conf b/infrastructure-provisioning/src/edge/templates/locations/dataengine-service.conf deleted file mode 100644 index 56f1a2957c..0000000000 --- a/infrastructure-provisioning/src/edge/templates/locations/dataengine-service.conf +++ /dev/null @@ -1,77 +0,0 @@ -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** -location /{{ CLUSTER_NAME }}/ { - rewrite ^/{{ CLUSTER_NAME }}/{{ CLUSTER_NAME }}/(.*)$ /$1 break; - rewrite ^/{{ CLUSTER_NAME }}/(.*)$ /$1 break; - proxy_pass http://{{ MASTER_IP }}:8088; - proxy_redirect http://{{ MASTER_IP }}:8088/ $scheme://$host/{{ CLUSTER_NAME }}/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - sub_filter_types *; - sub_filter_once off; - sub_filter '/static/' '/{{ CLUSTER_NAME }}/static/'; - sub_filter '/cluster/' '/{{ CLUSTER_NAME }}/cluster/'; - sub_filter '/conf' '/{{ CLUSTER_NAME }}/conf'; - sub_filter '/logs' '/{{ CLUSTER_NAME }}/logs'; - sub_filter '/stacks' '/{{ CLUSTER_NAME }}/stacks'; - sub_filter '/jmx' '/{{ CLUSTER_NAME }}/jmx'; - sub_filter '//{{ MASTER_DNS }}:20888' '//$host/{{ CLUSTER_NAME }}-application'; - sub_filter '//{{ MASTER_DNS }}:8088' '//$host/{{ CLUSTER_NAME }}'; - {% for item in slaves %} - sub_filter '//{{ item.dns }}:8042' '//$host/{{ CLUSTER_NAME }}-{{ item.name }}'; - {% endfor %} -} - -location /{{ CLUSTER_NAME }}-application/ { - rewrite ^/{{ CLUSTER_NAME }}-application/(.*)$ /$1 break; - proxy_pass http://{{ MASTER_IP }}:20888; - proxy_redirect http://{{ MASTER_IP }}:20888/ $scheme://$host/{{ CLUSTER_NAME }}-application/; - proxy_http_version 1.1; - proxy_set_header Accept-Encoding ""; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - sub_filter_types *; - sub_filter_once off; - sub_filter '/proxy/' '/{{ CLUSTER_NAME }}-application/proxy/'; -} - -{% for item in slaves %} -location /{{ CLUSTER_NAME }}-{{ item.name }}/ { - rewrite ^/{{ CLUSTER_NAME }}-{{ item.name }}/(.*)$ /$1 break; - proxy_pass http://{{ item.ip }}:8042; - proxy_redirect http://{{ item.ip }}:8042/ $scheme://$host/{{ CLUSTER_NAME }}-{{ item.name }}/; - proxy_http_version 1.1; - proxy_set_header Accept-Encoding ""; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - sub_filter_types *; - sub_filter_once off; - sub_filter '/static/' '/{{ CLUSTER_NAME }}-{{ item.name }}/static/'; - sub_filter '/node/' '/{{ CLUSTER_NAME }}-{{ item.name }}/node/'; - sub_filter '/conf' '/{{ CLUSTER_NAME }}-{{ item.name }}/conf'; - sub_filter '/logs' '/{{ CLUSTER_NAME }}-{{ item.name }}/logs'; - sub_filter '/stacks' '/{{ CLUSTER_NAME }}-{{ item.name }}/stacks'; - sub_filter '/jmx' '/{{ CLUSTER_NAME }}-{{ item.name }}/jmx'; - sub_filter '//{{ MASTER_DNS }}:8088' '//$host/{{ CLUSTER_NAME }}/'; -} - -{% endfor %} diff --git a/infrastructure-provisioning/src/edge/templates/locations/jupyter.conf b/infrastructure-provisioning/src/edge/templates/locations/jupyter.conf deleted file mode 100644 index 56f98ed39c..0000000000 --- a/infrastructure-provisioning/src/edge/templates/locations/jupyter.conf +++ /dev/null @@ -1,29 +0,0 @@ -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** -location ~* /{{ NAME }}/.* { - proxy_pass http://{{ IP }}:8888; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real-IP $remote_addr; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; -} diff --git a/infrastructure-provisioning/src/edge/templates/locations/rstudio.conf b/infrastructure-provisioning/src/edge/templates/locations/rstudio.conf deleted file mode 100644 index 4c63f97d39..0000000000 --- a/infrastructure-provisioning/src/edge/templates/locations/rstudio.conf +++ /dev/null @@ -1,30 +0,0 @@ -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** -location /{{ NAME }}/ { - rewrite ^/{{ NAME }}/(.*)$ /$1 break; - proxy_pass http://{{ IP }}:8787; - proxy_redirect http://{{ IP }}:8787/ $scheme://$host/{{ NAME }}/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_read_timeout 20d; -} - diff --git a/infrastructure-provisioning/src/edge/templates/locations/spark.conf b/infrastructure-provisioning/src/edge/templates/locations/spark.conf deleted file mode 100644 index 554de783b3..0000000000 --- a/infrastructure-provisioning/src/edge/templates/locations/spark.conf +++ /dev/null @@ -1,123 +0,0 @@ -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** -location /{{ CLUSTER_NAME }}/ { - rewrite ^/{{ CLUSTER_NAME }}/(.*)$ /$1 break; - proxy_pass http://{{ MASTER_IP }}:8080; - proxy_redirect http://{{ MASTER_IP }}:8080/ $scheme://$host/{{ CLUSTER_NAME }}/; - proxy_set_header Accept-Encoding ""; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - sub_filter_types *; - sub_filter_once off; - sub_filter '/static/' '/{{ CLUSTER_NAME }}/static/'; - sub_filter '/app/' '/{{ CLUSTER_NAME }}/app/'; - sub_filter ' /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON -- \ - $DAEMON_OPTS 2>/dev/null \ - || return 2 -} - -test_config() { - # Test the nginx configuration - $DAEMON -t $DAEMON_OPTS >/dev/null 2>&1 -} - -stop_nginx() { - # Stops the daemon/service - # - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=$STOP_SCHEDULE --pidfile $PID --name $NAME - RETVAL="$?" - sleep 1 - return "$RETVAL" -} - -reload_nginx() { - # Function that sends a SIGHUP to the daemon/service - start-stop-daemon --stop --signal HUP --quiet --pidfile $PID --name $NAME - return 0 -} - -rotate_logs() { - # Rotate log files - start-stop-daemon --stop --signal USR1 --quiet --pidfile $PID --name $NAME - return 0 -} - -upgrade_nginx() { - # Online upgrade nginx executable - # http://nginx.org/en/docs/control.html - # - # Return - # 0 if nginx has been successfully upgraded - # 1 if nginx is not running - # 2 if the pid files were not created on time - # 3 if the old master could not be killed - if start-stop-daemon --stop --signal USR2 --quiet --pidfile $PID --name $NAME; then - # Wait for both old and new master to write their pid file - while [ ! -s "${PID}.oldbin" ] || [ ! -s "${PID}" ]; do - cnt=`expr $cnt + 1` - if [ $cnt -gt 10 ]; then - return 2 - fi - sleep 1 - done - # Everything is ready, gracefully stop the old master - if start-stop-daemon --stop --signal QUIT --quiet --pidfile "${PID}.oldbin" --name $NAME; then - return 0 - else - return 3 - fi - else - return 1 - fi -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - start_nginx - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - stop_nginx - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - restart) - log_daemon_msg "Restarting $DESC" "$NAME" - - # Check configuration before stopping nginx - if ! test_config; then - log_end_msg 1 # Configuration error - exit $? - fi - - stop_nginx - case "$?" in - 0|1) - start_nginx - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - reload|force-reload) - log_daemon_msg "Reloading $DESC configuration" "$NAME" - - # Check configuration before stopping nginx - # - # This is not entirely correct since the on-disk nginx binary - # may differ from the in-memory one, but that's not common. - # We prefer to check the configuration and return an error - # to the administrator. - if ! test_config; then - log_end_msg 1 # Configuration error - exit $? - fi - - reload_nginx - log_end_msg $? - ;; - configtest|testconfig) - log_daemon_msg "Testing $DESC configuration" - test_config - log_end_msg $? - ;; - status) - status_of_proc -p $PID "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - upgrade) - log_daemon_msg "Upgrading binary" "$NAME" - upgrade_nginx - log_end_msg $? - ;; - rotate) - log_daemon_msg "Re-opening $DESC log files" "$NAME" - rotate_logs - log_end_msg $? - ;; - *) - echo "Usage: $NAME {start|stop|restart|reload|force-reload|status|configtest|rotate|upgrade}" >&2 - exit 3 - ;; -esac diff --git a/infrastructure-provisioning/src/edge/templates/nginx_redhat b/infrastructure-provisioning/src/edge/templates/nginx_redhat deleted file mode 100644 index 8f2c4c956a..0000000000 --- a/infrastructure-provisioning/src/edge/templates/nginx_redhat +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -# -# nginx - this script starts and stops the nginx daemon -# -# chkconfig: - 85 15 -# description: Nginx is an HTTP(S) server, HTTP(S) reverse \ -# proxy and IMAP/POP3 proxy server -# processname: nginx -# config: /etc/nginx/nginx.conf -# pidfile: /var/run/nginx.pid -# user: nginx - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" = "no" ] && exit 0 - -nginx="/usr/sbin/nginx" -prog=$(basename $nginx) - -NGINX_CONF_FILE="/etc/nginx/nginx.conf" - -lockfile=/var/run/nginx.lock - -start() { - [ -x $nginx ] || exit 5 - [ -f $NGINX_CONF_FILE ] || exit 6 - echo -n $"Starting $prog: " - daemon $nginx -c $NGINX_CONF_FILE - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc $prog -QUIT - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - configtest || return $? - stop - start -} - -reload() { - configtest || return $? - echo -n $"Reloading $prog: " - killproc $nginx -HUP - RETVAL=$? - echo -} - -force_reload() { - restart -} - -configtest() { - $nginx -t -c $NGINX_CONF_FILE -} - -rh_status() { - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart|configtest) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}" - exit 2 -esac diff --git a/infrastructure-provisioning/src/edge/templates/squid.conf b/infrastructure-provisioning/src/edge/templates/squid.conf deleted file mode 100644 index 0129e00d08..0000000000 --- a/infrastructure-provisioning/src/edge/templates/squid.conf +++ /dev/null @@ -1,62 +0,0 @@ -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -auth_param basic program LDAP_AUTH_PATH -b "LDAP_DN" -D "LDAP_SERVICE_USERNAME,LDAP_DN" -w LDAP_SERVICE_PASSWORD -f uid=%s LDAP_HOST - -acl DLab_user_src_subnet src PROXY_SUBNET -VPC_CIDRS -ALLOWED_CIDRS - - -acl SSL_ports port 443 -acl Safe_ports port 80 # http -acl Safe_ports port 21 # ftp -acl Safe_ports port 22 # ssh -acl Safe_ports port 443 # https -acl Safe_ports port 70 # gopher -acl Safe_ports port 210 # wais -acl Safe_ports port 1025-65535 # unregistered ports -acl Safe_ports port 280 # http-mgmt -acl Safe_ports port 488 # gss-http -acl Safe_ports port 591 # filemaker -acl Safe_ports port 777 # multiling http -acl CONNECT method CONNECT - -acl ldap-auth proxy_auth EDGE_USER_NAME - -http_access deny !Safe_ports -http_access allow localhost manager -http_access deny manager -http_access allow DLab_user_src_subnet -http_access allow AllowedCIDRS ldap-auth -http_access allow localhost -http_access deny all - -http_port 3128 - -cache deny all -cache_dir null /tmp -coredump_dir /var/spool/squid - -refresh_pattern ^ftp: 1440 20% 10080 -refresh_pattern ^gopher: 1440 0% 1440 -refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 -refresh_pattern . 0 20% 4320 diff --git a/infrastructure-provisioning/src/general/api/check_inactivity.py b/infrastructure-provisioning/src/general/api/check_inactivity.py index 5bacfeed88..31d7bb360c 100644 --- a/infrastructure-provisioning/src/general/api/check_inactivity.py +++ b/infrastructure-provisioning/src/general/api/check_inactivity.py @@ -50,10 +50,10 @@ reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/configure.py b/infrastructure-provisioning/src/general/api/configure.py index 9c917a4abf..4d6cc5f000 100644 --- a/infrastructure-provisioning/src/general/api/configure.py +++ b/infrastructure-provisioning/src/general/api/configure.py @@ -49,10 +49,10 @@ except: reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/create_image.py b/infrastructure-provisioning/src/general/api/create_image.py index 7e96c5d3a3..425cf26fc8 100644 --- a/infrastructure-provisioning/src/general/api/create_image.py +++ b/infrastructure-provisioning/src/general/api/create_image.py @@ -50,10 +50,10 @@ reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/git_creds.py b/infrastructure-provisioning/src/general/api/git_creds.py index 1e001e70b6..4edd370aff 100644 --- a/infrastructure-provisioning/src/general/api/git_creds.py +++ b/infrastructure-provisioning/src/general/api/git_creds.py @@ -50,10 +50,10 @@ reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/install_libs.py b/infrastructure-provisioning/src/general/api/install_libs.py index abbe2521b7..21489a98b4 100644 --- a/infrastructure-provisioning/src/general/api/install_libs.py +++ b/infrastructure-provisioning/src/general/api/install_libs.py @@ -50,10 +50,10 @@ reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/list_libs.py b/infrastructure-provisioning/src/general/api/list_libs.py index e5e7c41607..d7c97a95e8 100644 --- a/infrastructure-provisioning/src/general/api/list_libs.py +++ b/infrastructure-provisioning/src/general/api/list_libs.py @@ -50,21 +50,21 @@ reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - reply['response']['result']['file'] = "/opt/dlab/tmp/result/{0}_{1}_{2}_all_pkgs.json".format(os.environ['edge_user_name'], + reply['response']['result']['file'] = "/opt/dlab/tmp/result/{0}_{1}_{2}_all_pkgs.json".format(os.environ['project_name'], os.environ['application'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) try: with open("/root/all_pkgs.json") as f: tmp = json.loads(f.read()) - with open("/response/{}_{}_{}_all_pkgs.json".format(os.environ['edge_user_name'], + with open("/response/{}_{}_{}_all_pkgs.json".format(os.environ['project_name'], os.environ['application'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(tmp)) diff --git a/infrastructure-provisioning/src/general/api/project_prepare_var.py b/infrastructure-provisioning/src/general/api/project_prepare_var.py deleted file mode 100644 index 765beab480..0000000000 --- a/infrastructure-provisioning/src/general/api/project_prepare_var.py +++ /dev/null @@ -1,585 +0,0 @@ -#!/usr/bin/python - -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - -import json -from dlab.fab import * -from dlab.meta_lib import * -import sys, time, os -from dlab.actions_lib import * -import traceback - - -if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_tag'], - os.environ['request_id']) - local_log_filepath = "/logs/project/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - create_aws_config_files() - print('Generating infrastructure names and tags') - project_conf = dict() - project_conf['service_base_name'] = os.environ['conf_service_base_name'] - project_conf['project_tag_value'] = os.environ['project_tag'] - project_conf['key_name'] = os.environ['conf_key_name'] - project_conf['admin_keyname'] = os.environ['project_admin_name'] - project_conf['public_subnet_id'] = os.environ['aws_subnet_id'] - project_conf['vpc_id'] = os.environ['aws_vpc_id'] - project_conf['region'] = os.environ['aws_region'] - project_conf['ami_id'] = get_ami_id(os.environ['aws_{}_image_name'.format(os.environ['conf_os_family'])]) - project_conf['instance_size'] = os.environ['aws_edge_instance_size'] - project_conf['sg_ids'] = os.environ['aws_security_groups_ids'] - project_conf['edge_instance_name'] = '{}-{}-edge'.format(project_conf['service_base_name'], os.environ['project_tag']) - project_conf['tag_name'] = '{}-Tag'.format(project_conf['service_base_name']) - project_conf['bucket_name_tag'] = '{}-{}-bucket'.format(project_conf['service_base_name'], - os.environ['project_tag']) - project_conf['bucket_name'] = project_conf['bucket_name_tag'].lower().replace('_', '-') - project_conf['ssn_bucket_name'] = '{}-ssn-bucket'.format(project_conf['service_base_name']).lower().replace('_', '-') - project_conf['shared_bucket_name'] = '{}-shared-bucket'.format(project_conf['service_base_name']).lower().replace('_', - '-') - project_conf['edge_role_name'] = '{}-{}-edge-Role'.format(project_conf['service_base_name'].lower().replace('-', '_'), - os.environ['project_tag']) - project_conf['edge_role_profile_name'] = '{}-{}-edge-Profile'.format(project_conf['service_base_name'].lower().replace('-', - '_'), - os.environ['project_tag']) - project_conf['edge_policy_name'] = '{}-{}-edge-Policy'.format(project_conf['service_base_name'].lower().replace('-', '_'), - os.environ['project_tag']) - project_conf['edge_security_group_name'] = '{}-SG'.format(project_conf['edge_instance_name']) - project_conf['notebook_instance_name'] = '{}-{}-nb'.format(project_conf['service_base_name'], - os.environ['project_tag']) - project_conf['dataengine_instances_name'] = '{}-{}-dataengine' \ - .format(project_conf['service_base_name'], os.environ['project_tag']) - project_conf['notebook_dataengine_role_name'] = '{}-{}-nb-de-Role' \ - .format(project_conf['service_base_name'].lower().replace('-', '_'), os.environ['project_tag']) - project_conf['notebook_dataengine_policy_name'] = '{}-{}-nb-de-Policy' \ - .format(project_conf['service_base_name'].lower().replace('-', '_'), os.environ['project_tag']) - project_conf['notebook_dataengine_role_profile_name'] = '{}-{}-nb-de-Profile' \ - .format(project_conf['service_base_name'].lower().replace('-', '_'), os.environ['project_tag']) - project_conf['notebook_security_group_name'] = '{}-{}-nb-SG'.format(project_conf['service_base_name'], - os.environ['project_tag']) - project_conf['private_subnet_prefix'] = os.environ['aws_private_subnet_prefix'] - project_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(project_conf['service_base_name'], - os.environ['project_tag']) - project_conf['dataengine_master_security_group_name'] = '{}-{}-dataengine-master-sg' \ - .format(project_conf['service_base_name'], os.environ['project_tag']) - project_conf['dataengine_slave_security_group_name'] = '{}-{}-dataengine-slave-sg' \ - .format(project_conf['service_base_name'], os.environ['project_tag']) - project_conf['allowed_ip_cidr'] = list() - for cidr in os.environ['conf_allowed_ip_cidr'].split(','): - project_conf['allowed_ip_cidr'].append({"CidrIp": cidr.replace(' ','')}) - project_conf['network_type'] = os.environ['conf_network_type'] - project_conf['all_ip_cidr'] = '0.0.0.0/0' - project_conf['zone'] = os.environ['aws_region'] + os.environ['aws_zone'] - project_conf['elastic_ip_name'] = '{0}-{1}-edge-EIP'.format(project_conf['service_base_name'], - os.environ['project_tag']) - if 'aws_user_predefined_s3_policies' not in os.environ: - os.environ['aws_user_predefined_s3_policies'] = 'None' - - try: - if os.environ['conf_user_subnets_range'] == '': - raise KeyError - except KeyError: - os.environ['conf_user_subnets_range'] = '' - - # FUSE in case of absence of user's key - fname = "{}{}.pub".format(os.environ['conf_key_dir'], project_conf['admin_keyname']) - print(fname) - if not os.path.isfile(fname): - print("ADMINSs PUBLIC KEY DOES NOT EXIST in {}".format(fname)) - sys.exit(1) - - print("Will create exploratory environment with edge node as access point as following: {}". - format(json.dumps(project_conf, sort_keys=True, indent=4, separators=(',', ': ')))) - logging.info(json.dumps(project_conf)) - - try: - project_conf['vpc2_id'] = os.environ['aws_vpc2_id'] - project_conf['tag_name'] = '{}-secondary-Tag'.format(project_conf['service_base_name']) - except KeyError: - project_conf['vpc2_id'] = project_conf['vpc_id'] - - try: - logging.info('[CREATE SUBNET]') - print('[CREATE SUBNET]') - params = "--vpc_id '{}' --infra_tag_name {} --infra_tag_value {} --prefix {} " \ - "--user_subnets_range '{}' --subnet_name {} --zone {}".format( - project_conf['vpc2_id'], project_conf['tag_name'], project_conf['service_base_name'], - project_conf['private_subnet_prefix'], os.environ['conf_user_subnets_range'], - project_conf['private_subnet_name'], - project_conf['zone']) - try: - local("~/scripts/{}.py {}".format('common_create_subnet', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create subnet.", str(err)) - sys.exit(1) - - tag = {"Key": project_conf['tag_name'], - "Value": "{0}-{1}-subnet".format(project_conf['service_base_name'], project_conf['project_tag_value'])} - project_conf['private_subnet_cidr'] = get_subnet_by_tag(tag) - project_tag = {"Key": 'project_tag', "Value": project_conf['project_tag_value']} - subnet_id = get_subnet_by_cidr(project_conf['private_subnet_cidr']) - print('subnet id: {}'.format(subnet_id)) - create_tag(subnet_id, project_tag) - print('NEW SUBNET CIDR CREATED: {}'.format(project_conf['private_subnet_cidr'])) - - try: - logging.info('[CREATE EDGE ROLES]') - print('[CREATE EDGE ROLES]') - params = "--role_name {} --role_profile_name {} --policy_name {} --region {} --infra_tag_name {} " \ - "--infra_tag_value {}" \ - .format(project_conf['edge_role_name'], project_conf['edge_role_profile_name'], - project_conf['edge_policy_name'], os.environ['aws_region'], project_conf['tag_name'], - project_conf['service_base_name']) - try: - local("~/scripts/{}.py {}".format('common_create_role_policy', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to creating roles.", str(err)) - sys.exit(1) - - try: - logging.info('[CREATE BACKEND (NOTEBOOK) ROLES]') - print('[CREATE BACKEND (NOTEBOOK) ROLES]') - params = "--role_name {} --role_profile_name {} --policy_name {} --region {} --infra_tag_name {} " \ - "--infra_tag_value {}" \ - .format(project_conf['notebook_dataengine_role_name'], project_conf['notebook_dataengine_role_profile_name'], - project_conf['notebook_dataengine_policy_name'], os.environ['aws_region'], project_conf['tag_name'], - project_conf['service_base_name']) - try: - local("~/scripts/{}.py {}".format('common_create_role_policy', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to creating roles.", str(err)) - remove_all_iam_resources('edge', os.environ['project_tag']) - sys.exit(1) - - try: - logging.info('[CREATE SECURITY GROUP FOR EDGE NODE]') - print('[CREATE SECURITY GROUPS FOR EDGE]') - edge_sg_ingress = format_sg([ - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "UserIdGroupPairs": [], "PrefixListIds": [] - }, - { - "PrefixListIds": [], - "FromPort": 22, - "IpRanges": project_conf['allowed_ip_cidr'], - "ToPort": 22, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 3128, - "IpRanges": project_conf['allowed_ip_cidr'], - "ToPort": 3128, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 80, - "IpRanges": project_conf['allowed_ip_cidr'], - "ToPort": 80, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": get_instance_ip_address(project_conf['tag_name'], '{}-ssn'.format( - project_conf['service_base_name'])).get('Private') + "/32"}], - "UserIdGroupPairs": [], - "PrefixListIds": [] - } - ]) - edge_sg_egress = format_sg([ - { - "PrefixListIds": [], - "FromPort": 22, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 22, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8888, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 8888, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8080, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 8080, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8787, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 8787, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 6006, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 6006, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 20888, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 20888, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8042, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 8042, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8088, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 8088, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8081, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 8081, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 4040, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 4140, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 18080, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 18080, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 50070, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 50070, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 53, - "IpRanges": [{"CidrIp": project_conf['all_ip_cidr']}], - "ToPort": 53, "IpProtocol": "udp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 80, - "IpRanges": [{"CidrIp": project_conf['all_ip_cidr']}], - "ToPort": 80, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 123, - "IpRanges": [{"CidrIp": project_conf['all_ip_cidr']}], - "ToPort": 123, "IpProtocol": "udp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 443, - "IpRanges": [{"CidrIp": project_conf['all_ip_cidr']}], - "ToPort": 443, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 8085, - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "ToPort": 8085, "IpProtocol": "tcp", "UserIdGroupPairs": [] - }, - { - "PrefixListIds": [], - "FromPort": 389, - "IpRanges": [{"CidrIp": project_conf['all_ip_cidr']}], - "ToPort": 389, "IpProtocol": "tcp", "UserIdGroupPairs": [] - } - ]) - params = "--name {} --vpc_id {} --security_group_rules '{}' --infra_tag_name {} --infra_tag_value {} \ - --egress '{}' --force {} --nb_sg_name {} --resource {}".\ - format(project_conf['edge_security_group_name'], project_conf['vpc_id'], json.dumps(edge_sg_ingress), - project_conf['service_base_name'], project_conf['edge_instance_name'], json.dumps(edge_sg_egress), - True, project_conf['notebook_instance_name'], 'edge') - try: - local("~/scripts/{}.py {}".format('common_create_security_group', params)) - except Exception as err: - traceback.print_exc() - append_result("Failed creating security group for edge node.", str(err)) - raise Exception - - with hide('stderr', 'running', 'warnings'): - print('Waiting for changes to propagate') - time.sleep(10) - except: - remove_all_iam_resources('notebook', os.environ['project_tag']) - remove_all_iam_resources('edge', os.environ['project_tag']) - sys.exit(1) - - try: - logging.info('[CREATE SECURITY GROUP FOR PRIVATE SUBNET]') - print('[CREATE SECURITY GROUP FOR PRIVATE SUBNET]') - project_group_id = check_security_group(project_conf['edge_security_group_name']) - sg_list = project_conf['sg_ids'].replace(" ", "").split(',') - rules_list = [] - for i in sg_list: - rules_list.append({"GroupId": i}) - private_sg_ingress = format_sg([ - { - "IpProtocol": "-1", - "IpRanges": [], - "UserIdGroupPairs": [{"GroupId": project_group_id}], - "PrefixListIds": [] - }, - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "UserIdGroupPairs": [], - "PrefixListIds": [] - }, - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": get_instance_ip_address(project_conf['tag_name'], '{}-ssn'.format( - project_conf['service_base_name'])).get('Private') + "/32"}], - "UserIdGroupPairs": [], - "PrefixListIds": [] - } - ]) - - private_sg_egress = format_sg([ - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": project_conf['private_subnet_cidr']}], - "UserIdGroupPairs": [], - "PrefixListIds": [] - }, - { - "IpProtocol": "-1", - "IpRanges": [{"CidrIp": get_instance_ip_address(project_conf['tag_name'], '{}-ssn'.format( - project_conf['service_base_name'])).get('Private') + "/32"}], - "UserIdGroupPairs": [], - "PrefixListIds": [], - }, - { - "IpProtocol": "-1", - "IpRanges": [], - "UserIdGroupPairs": [{"GroupId": project_group_id}], - "PrefixListIds": [] - }, - { - "IpProtocol": "tcp", - "IpRanges": [{"CidrIp": project_conf['all_ip_cidr']}], - "FromPort": 443, - "ToPort": 443, - "UserIdGroupPairs": [], - "PrefixListIds": [], - } - ]) - - params = "--name {} --vpc_id {} --security_group_rules '{}' --egress '{}' --infra_tag_name {} " \ - "--infra_tag_value {} --force {}".format(project_conf['notebook_security_group_name'], - project_conf['vpc2_id'], json.dumps(private_sg_ingress), - json.dumps(private_sg_egress), project_conf['service_base_name'], - project_conf['notebook_instance_name'], True) - try: - local("~/scripts/{}.py {}".format('common_create_security_group', params)) - except: - traceback.print_exc() - raise Exception - - with hide('stderr', 'running', 'warnings'): - print('Waiting for changes to propagate') - time.sleep(10) - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed creating security group for private subnet.", str(err)) - remove_all_iam_resources('notebook', os.environ['project_tag']) - remove_all_iam_resources('edge', os.environ['project_tag']) - remove_sgroups(project_conf['notebook_instance_name']) - remove_sgroups(project_conf['edge_instance_name']) - sys.exit(1) - - logging.info('[CREATING SECURITY GROUPS FOR MASTER NODE]') - print("[CREATING SECURITY GROUPS FOR MASTER NODE]") - try: - params = "--name {} --vpc_id {} --security_group_rules '{}' --egress '{}' --infra_tag_name {} " \ - "--infra_tag_value {} --force {}".format(project_conf['dataengine_master_security_group_name'], - project_conf['vpc2_id'], json.dumps(private_sg_ingress), - json.dumps(private_sg_egress), project_conf['service_base_name'], - project_conf['dataengine_instances_name'], True) - try: - local("~/scripts/{}.py {}".format('common_create_security_group', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create sg.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['edge_instance_name']) - sys.exit(1) - - logging.info('[CREATING SECURITY GROUPS FOR SLAVE NODES]') - print("[CREATING SECURITY GROUPS FOR SLAVE NODES]") - try: - params = "--name {} --vpc_id {} --security_group_rules '{}' --egress '{}' --infra_tag_name {} " \ - "--infra_tag_value {} --force {}".format(project_conf['dataengine_slave_security_group_name'], - project_conf['vpc2_id'], json.dumps(private_sg_ingress), - json.dumps(private_sg_egress), project_conf['service_base_name'], - project_conf['dataengine_instances_name'], True) - try: - local("~/scripts/{}.py {}".format('common_create_security_group', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create bucket.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(edge_conf['dataengine_instances_name']) - remove_sgroups(edge_conf['notebook_instance_name']) - remove_sgroups(edge_conf['edge_instance_name']) - sys.exit(1) - - try: - logging.info('[CREATE BUCKETS]') - print('[CREATE BUCKETS]') - params = "--bucket_name {} --infra_tag_name {} --infra_tag_value {} --region {} --bucket_name_tag {}" \ - .format(project_conf['bucket_name'], project_conf['tag_name'], project_conf['bucket_name'], - project_conf['region'], project_conf['bucket_name_tag']) - try: - local("~/scripts/{}.py {}".format('common_create_bucket', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create bucket.", str(err)) - remove_all_iam_resources('notebook', os.environ['edge_user_name']) - remove_all_iam_resources('edge', os.environ['edge_user_name']) - remove_sgroups(project_conf['dataengine_instances_name']) - remove_sgroups(project_conf['notebook_instance_name']) - remove_sgroups(project_conf['edge_instance_name']) - sys.exit(1) - - try: - logging.info('[CREATING BUCKET POLICY FOR USER INSTANCES]') - print('[CREATING BUCKET POLICY FOR USER INSTANCES]') - params = '--bucket_name {} --ssn_bucket_name {} --shared_bucket_name {} --username {} --edge_role_name {} ' \ - '--notebook_role_name {} --service_base_name {} --region {} ' \ - '--user_predefined_s3_policies "{}"'.format(project_conf['bucket_name'], project_conf['ssn_bucket_name'], - project_conf['shared_bucket_name'], - os.environ['project_tag'], project_conf['edge_role_name'], - project_conf['notebook_dataengine_role_name'], - project_conf['service_base_name'], project_conf['region'], - os.environ['aws_user_predefined_s3_policies']) - try: - local("~/scripts/{}.py {}".format('common_create_policy', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create bucket policy.", str(err)) - remove_all_iam_resources('notebook', os.environ['project_tag']) - remove_all_iam_resources('edge', os.environ['project_tag']) - remove_sgroups(project_conf['dataengine_instances_name']) - remove_sgroups(project_conf['notebook_instance_name']) - remove_sgroups(project_conf['edge_instance_name']) - remove_s3('edge', os.environ['project_tag']) - sys.exit(1) - - try: - logging.info('[CREATE EDGE INSTANCE]') - print('[CREATE EDGE INSTANCE]') - params = "--node_name {} --ami_id {} --instance_type {} --key_name {} --security_group_ids {} " \ - "--subnet_id {} --iam_profile {} --infra_tag_name {} --infra_tag_value {}" \ - .format(project_conf['edge_instance_name'], project_conf['ami_id'], project_conf['instance_size'], project_conf['key_name'], - project_group_id, project_conf['public_subnet_id'], project_conf['edge_role_profile_name'], - project_conf['tag_name'], project_conf['edge_instance_name']) - try: - local("~/scripts/{}.py {}".format('common_create_instance', params)) - except: - traceback.print_exc() - raise Exception - - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to create instance.", str(err)) - remove_all_iam_resources('notebook', os.environ['project_tag']) - remove_all_iam_resources('edge', os.environ['project_tag']) - remove_sgroups(project_conf['dataengine_instances_name']) - remove_sgroups(project_conf['notebook_instance_name']) - remove_sgroups(project_conf['edge_instance_name']) - remove_s3('edge', os.environ['project_tag']) - sys.exit(1) - - if project_conf['network_type'] == 'public': - try: - logging.info('[ASSOCIATING ELASTIC IP]') - print('[ASSOCIATING ELASTIC IP]') - project_conf['edge_id'] = get_instance_by_name(project_conf['tag_name'], project_conf['edge_instance_name']) - try: - project_conf['elastic_ip'] = os.environ['edge_elastic_ip'] - except: - project_conf['elastic_ip'] = 'None' - params = "--elastic_ip {} --edge_id {} --infra_tag_name {} --infra_tag_value {}".format( - project_conf['elastic_ip'], project_conf['edge_id'], project_conf['tag_name'], project_conf['elastic_ip_name']) - try: - local("~/scripts/{}.py {}".format('edge_associate_elastic_ip', params)) - except: - traceback.print_exc() - raise Exception - except Exception as err: - print('Error: {0}'.format(err)) - append_result("Failed to associate elastic ip.", str(err)) - try: - project_conf['edge_public_ip'] = get_instance_ip_address(project_conf['tag_name'], - project_conf['edge_instance_name']).get('Public') - project_conf['allocation_id'] = get_allocation_id_by_elastic_ip(project_conf['edge_public_ip']) - except: - print("No Elastic IPs to release!") - remove_ec2(project_conf['tag_name'], project_conf['edge_instance_name']) - remove_all_iam_resources('notebook', os.environ['project_tag']) - remove_all_iam_resources('edge', os.environ['project_tag']) - remove_sgroups(project_conf['dataengine_instances_name']) - remove_sgroups(project_conf['notebook_instance_name']) - remove_sgroups(project_conf['edge_instance_name']) - remove_s3('edge', os.environ['project_tag']) - sys.exit(1) \ No newline at end of file diff --git a/infrastructure-provisioning/src/general/api/reconfigure_spark.py b/infrastructure-provisioning/src/general/api/reconfigure_spark.py index b7458dce5b..09139caa53 100644 --- a/infrastructure-provisioning/src/general/api/reconfigure_spark.py +++ b/infrastructure-provisioning/src/general/api/reconfigure_spark.py @@ -50,10 +50,10 @@ reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/recreate.py b/infrastructure-provisioning/src/general/api/recreate.py index 4d7d3fc964..e91e57974e 100644 --- a/infrastructure-provisioning/src/general/api/recreate.py +++ b/infrastructure-provisioning/src/general/api/recreate.py @@ -56,10 +56,10 @@ response_file.write(json.dumps(reply)) else: reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/reupload_key.py b/infrastructure-provisioning/src/general/api/reupload_key.py index 771abae568..d4af110993 100644 --- a/infrastructure-provisioning/src/general/api/reupload_key.py +++ b/infrastructure-provisioning/src/general/api/reupload_key.py @@ -52,10 +52,10 @@ log = "/var/log/dlab/edge/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) try: - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) print(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/start.py b/infrastructure-provisioning/src/general/api/start.py index 335858816c..469d5a6898 100644 --- a/infrastructure-provisioning/src/general/api/start.py +++ b/infrastructure-provisioning/src/general/api/start.py @@ -49,10 +49,10 @@ except: reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/status.py b/infrastructure-provisioning/src/general/api/status.py index 0b007b9582..e289c9c945 100644 --- a/infrastructure-provisioning/src/general/api/status.py +++ b/infrastructure-provisioning/src/general/api/status.py @@ -49,10 +49,10 @@ except: reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/stop.py b/infrastructure-provisioning/src/general/api/stop.py index a92c674567..8dc2a1173a 100644 --- a/infrastructure-provisioning/src/general/api/stop.py +++ b/infrastructure-provisioning/src/general/api/stop.py @@ -50,10 +50,10 @@ reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/api/terminate_image.py b/infrastructure-provisioning/src/general/api/terminate_image.py index b24462d44a..0700686143 100644 --- a/infrastructure-provisioning/src/general/api/terminate_image.py +++ b/infrastructure-provisioning/src/general/api/terminate_image.py @@ -50,10 +50,10 @@ reply['response']['result'] = {"error": "Failed to open result.json"} reply['response']['log'] = "/var/log/dlab/{0}/{0}_{1}_{2}.log".format(os.environ['conf_resource'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['request_id']) - with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['edge_user_name'], + with open("/response/{}_{}_{}.json".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']), 'w') as response_file: response_file.write(json.dumps(reply)) diff --git a/infrastructure-provisioning/src/general/files/aws/base_Dockerfile b/infrastructure-provisioning/src/general/files/aws/base_Dockerfile index a86d64f9e7..f3ef362ec6 100644 --- a/infrastructure-provisioning/src/general/files/aws/base_Dockerfile +++ b/infrastructure-provisioning/src/general/files/aws/base_Dockerfile @@ -43,6 +43,7 @@ RUN mkdir -p /root/.ssh; echo "Host *" > /root/.ssh/config; \ # Configuring log directories RUN mkdir -p /response; chmod a+rwx /response && \ mkdir -p /logs/ssn; chmod a+rwx /logs/ssn && \ + mkdir -p /logs/project; chmod a+rwx /logs/project && \ mkdir -p /logs/edge; chmod a+rwx /logs/edge && \ mkdir -p /logs/notebook; chmod a+rwx /logs/notebook && \ mkdir -p /logs/dataengine; chmod a+rwx /logs/dataengine && \ @@ -69,7 +70,7 @@ COPY ${SRC_PATH}general/lib/os/${OS}/common_lib.py /usr/lib/python2.7/dlab/commo COPY ${SRC_PATH}general/lib/os/fab.py /usr/lib/python2.7/dlab/fab.py COPY ${SRC_PATH}general/files/os/${OS}/sources.list /root/files/ COPY ${SRC_PATH}general/files/os/ivysettings.xml /root/templates/ -COPY ${SRC_PATH}edge/templates/locations/ /root/locations/ +COPY ${SRC_PATH}project/templates/locations/ /root/locations/ RUN chmod a+x /root/*.py && \ chmod a+x /root/scripts/* && \ diff --git a/infrastructure-provisioning/src/general/files/aws/edge_Dockerfile b/infrastructure-provisioning/src/general/files/aws/edge_Dockerfile deleted file mode 100644 index 143eee6029..0000000000 --- a/infrastructure-provisioning/src/general/files/aws/edge_Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -# ***************************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# ****************************************************************************** - - -FROM docker.dlab-base:latest - -ARG OS - -COPY edge/ /root/ -COPY general/scripts/aws/edge_* /root/scripts/ -COPY general/lib/os/${OS}/edge_lib.py /usr/lib/python2.7/dlab/edge_lib.py -COPY general/templates/aws/edge_s3_policy.json /root/templates/edge_s3_policy.json - -RUN chmod a+x /root/fabfile.py; \ - chmod a+x /root/scripts/* - diff --git a/infrastructure-provisioning/src/general/files/aws/edge_description.json b/infrastructure-provisioning/src/general/files/aws/edge_description.json deleted file mode 100644 index 3f9a65cf62..0000000000 --- a/infrastructure-provisioning/src/general/files/aws/edge_description.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "template_name": "Crete exploratory environment.", - "description": "Create user subnet, bucket and edge node for access." -} \ No newline at end of file diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py index a501e91d8a..2a51b1b772 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py @@ -36,7 +36,7 @@ def configure_http_proxy_server(config): put(template_file, '/tmp/squid.conf') sudo('\cp /tmp/squid.conf /etc/squid/squid.conf') sudo('sed -i "s|PROXY_SUBNET|{}|g" /etc/squid/squid.conf'.format(proxy_subnet)) -# sudo('sed -i "s|EDGE_USER_NAME|{}|g" /etc/squid/squid.conf'.format(config['edge_user_name'])) + sudo('sed -i "s|EDGE_USER_NAME|{}|g" /etc/squid/squid.conf'.format(config['project_name'])) sudo('sed -i "s|LDAP_HOST|{}|g" /etc/squid/squid.conf'.format(config['ldap_host'])) sudo('sed -i "s|LDAP_DN|{}|g" /etc/squid/squid.conf'.format(config['ldap_dn'])) sudo('sed -i "s|LDAP_SERVICE_USERNAME|{}|g" /etc/squid/squid.conf'.format(config['ldap_user'])) diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py index 1b92581e6a..8f57e9c676 100644 --- a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py @@ -36,7 +36,7 @@ def configure_http_proxy_server(config): put(template_file, '/tmp/squid.conf') sudo('\cp /tmp/squid.conf /etc/squid/squid.conf') sudo('sed -i "s|PROXY_SUBNET|{}|g" /etc/squid/squid.conf'.format(proxy_subnet)) - sudo('sed -i "s|EDGE_USER_NAME|{}|g" /etc/squid/squid.conf'.format(config['edge_user_name'])) + sudo('sed -i "s|EDGE_USER_NAME|{}|g" /etc/squid/squid.conf'.format(config['project_name'])) sudo('sed -i "s|LDAP_HOST|{}|g" /etc/squid/squid.conf'.format(config['ldap_host'])) sudo('sed -i "s|LDAP_DN|{}|g" /etc/squid/squid.conf'.format(config['ldap_dn'])) sudo('sed -i "s|LDAP_SERVICE_USERNAME|{}|g" /etc/squid/squid.conf'.format(config['ldap_user'])) diff --git a/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py b/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py index 5cee0bc022..622297a945 100644 --- a/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py +++ b/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py @@ -119,7 +119,7 @@ def clean_tensor_rstudio(): if os.environ['conf_cloud_provider'] == 'azure': de_master_name = '{}-{}-de-{}-{}-m'.format( os.environ['conf_service_base_name'], - os.environ['edge_user_name'].replace("_", "-"), + os.environ['project_name'].replace("_", "-"), os.environ['exploratory_name'].replace("_", "-"), os.environ['computational_name'].replace("_", "-")) de_ami_id = AzureMeta().get_instance_image(os.environ['azure_resource_group_name'], @@ -128,7 +128,7 @@ def clean_tensor_rstudio(): else: de_master_name = '{}-{}-de-{}-{}-m'.format( os.environ['conf_service_base_name'], - os.environ['edge_user_name'], + os.environ['project_name'], os.environ['exploratory_name'], os.environ['computational_name']) de_ami_id = get_ami_id_by_instance_name(de_master_name) diff --git a/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py b/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py index c7677ee280..089e3166c9 100644 --- a/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py +++ b/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py @@ -49,7 +49,7 @@ def install_libs_on_slaves(slave, data_engine): if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py b/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py index 6d1773355f..0cc5f6e891 100644 --- a/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py +++ b/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py @@ -32,7 +32,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py b/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py index 67c30fa3ac..006a3137e5 100644 --- a/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py +++ b/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py @@ -49,7 +49,7 @@ def install_libs_on_slaves(slave, data_engine): if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py b/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py index 81719ba70a..23f889f405 100644 --- a/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py +++ b/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py @@ -32,7 +32,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_inactivity_check.py b/infrastructure-provisioning/src/general/scripts/os/notebook_inactivity_check.py index 85f3b8e553..59074f8e92 100644 --- a/infrastructure-provisioning/src/general/scripts/os/notebook_inactivity_check.py +++ b/infrastructure-provisioning/src/general/scripts/os/notebook_inactivity_check.py @@ -30,8 +30,8 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) + local_log_filepath = "/logs/project/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, filename=local_log_filepath) diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py b/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py index 2b2559e88b..17abe27265 100644 --- a/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py +++ b/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py @@ -33,7 +33,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py b/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py index 49387b3105..839f3f9119 100644 --- a/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py +++ b/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py @@ -32,7 +32,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py b/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py index f5f01169ab..849333cb51 100644 --- a/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py +++ b/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py @@ -33,7 +33,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/tensor/fabfile.py b/infrastructure-provisioning/src/tensor/fabfile.py index 4509ad43e5..b183d2850e 100644 --- a/infrastructure-provisioning/src/tensor/fabfile.py +++ b/infrastructure-provisioning/src/tensor/fabfile.py @@ -33,7 +33,7 @@ # Main function for provisioning notebook server def run(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -61,7 +61,7 @@ def run(): # Main function for terminating exploratory environment def terminate(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -76,7 +76,7 @@ def terminate(): # Main function for stopping notebook server def stop(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -91,7 +91,7 @@ def stop(): # Main function for starting notebook server def start(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -107,7 +107,7 @@ def start(): # Main function for configuring notebook server after deploying DataEngine service def configure(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -125,7 +125,7 @@ def configure(): # Main function for installing additional libraries for notebook def install_libs(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -142,7 +142,7 @@ def install_libs(): # Main function for get available libraries for notebook def list_libs(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -159,7 +159,7 @@ def list_libs(): # Main function for manage git credentials on notebook def git_creds(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -176,7 +176,7 @@ def git_creds(): # Main function for creating image from notebook def create_image(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -193,7 +193,7 @@ def create_image(): # Main function for deleting existing notebook image def terminate_image(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -210,7 +210,7 @@ def terminate_image(): # Main function for reconfiguring Spark for notebook def reconfigure_spark(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -226,7 +226,7 @@ def reconfigure_spark(): # Main function for checking inactivity status def check_inactivity(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', From 214a9ac58b1c3018a66b92d2bb2b0ca959be9c7d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 25 Jun 2019 13:08:20 +0300 Subject: [PATCH 214/357] [DLAB-740]: key uploading fixes --- .../project-form/project-form.component.html | 14 +-- .../project-form/project-form.component.ts | 4 +- .../webapp/src/assets/styles/_theme.scss | 85 ++++++++++++++++++- 3 files changed, 91 insertions(+), 12 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 7adb2992e4..052bcd8a43 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -30,17 +30,19 @@
- + Upload - + - -
{{ keyLabel }}
+ +
+ {{ keyLabel }}
@@ -107,7 +109,7 @@
+ class="material-icons">keyboard_arrow_leftBack
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 8f1fde02f7..3c2627b4db 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -100,7 +100,7 @@ export class ProjectFormComponent implements OnInit { public onFileChange($event) { const reader = new FileReader(); - if($event.target.files && $event.target.files.length) { + if ($event.target.files && $event.target.files.length) { const [file] = $event.target.files; reader.readAsDataURL(file); @@ -123,6 +123,7 @@ export class ProjectFormComponent implements OnInit { private initFormModel(): void { this.projectForm = this._fb.group({ + 'key': ['', Validators.required], 'name': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern), this.checkDuplication.bind(this)])], 'endpoints': [[], Validators.required], 'tag': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern)])], @@ -142,7 +143,6 @@ export class ProjectFormComponent implements OnInit { } private getLabel(file: File): string { - debugger; return file ? !this.accessKeyValid ? 'Public key is required.' : file.name : ''; } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 7ddacce566..49458799da 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -28,11 +28,13 @@ font-size: 15px; font-family: 'Open Sans', sans-serif; color: #577289; + i { margin: 0 5px 0 0; font-size: 20px; vertical-align: sub; } + span { i { margin: 0 5px 0 0; @@ -40,27 +42,34 @@ vertical-align: sub; } } + &.mini { width: 80px; } + &.action { width: 140px; } + &.butt-success { background-color: #49af38; margin-left: 25px; color: #fff; + &.mini { margin-left: 5px; width: 80px; } } + &.butt-create { color: #35afd5; - &:disabled{ - color: #577289!important; + + &:disabled { + color: #577289 !important; } } + &:disabled { cursor: not-allowed; opacity: 0.6; @@ -78,14 +87,18 @@ font-size: 15px; font-weight: 300; box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + mat-form-field { width: 100%; + .mat-form-field-wrapper { padding-bottom: 0; } + .mat-icon { font-size: 20px; } + .caret { width: 40px; height: 40px; @@ -97,6 +110,7 @@ right: 0; top: 0px; cursor: pointer; + &.not-allowed { background-color: #dcdcdc; } @@ -107,6 +121,7 @@ .multiple-select { border-bottom: 1px solid #dedbdb; padding: 0; + a { display: inline-block; width: 50%; @@ -115,14 +130,17 @@ vertical-align: middle; color: #575757; cursor: pointer; + i { vertical-align: sub; font-size: 20px; } + &:hover { color: #4eaf3e; background: #f9fafb; } + &.deselect { &:hover { color: #f1696e; @@ -138,12 +156,14 @@ .mat-button-ripple.mat-button-ripple-round.mat-ripple { border-radius: 0; } + .ticker-wrap .mat-button-ripple.mat-button-ripple-round.mat-ripple { border-radius: 50%; } .mat-option { font-family: 'Open Sans', sans-serif; + .mat-option-text { color: #607D8B; font-size: 15px; @@ -153,27 +173,33 @@ .mat-option.mat-selected { color: #35afd5 !important; } + /*.mat-input-placeholder.mat-focused, */ .mat-input-underline .mat-input-ripple, .mat-form-field-underline .mat-form-field-ripple, .mat-select-underline .mat-input-underline { background-color: #35afd5 !important; } + .mat-input-placeholder.mat-focused, .mat-select:focus:not(.mat-select-disabled) .mat-select-trigger, .mat-select:focus:not(.mat-select-disabled) .mat-select-arrow, .mat-select:focus:not(.mat-select-disabled) .mat-select-underline { color: #35afd5 !important; } + .mat-select:focus:not(.mat-select-disabled) .mat-select-underline { background-color: #35afd5 !important; } + .mat-select-placeholder { font-size: 14px; } + .mat-input-placeholder { font-weight: 400; } + .mat-datepicker-toggle-active { color: #2dadd7; } @@ -185,7 +211,7 @@ height: 34px; } - span.mat-slide-toggle-content { +span.mat-slide-toggle-content { // font: 100 16px/24px 'Open Sans', sans-serif; font-style: normal; font-weight: 100; @@ -193,16 +219,20 @@ line-height: 24px; font-family: 'Open Sans', sans-serif; } + .backup-dialog .mat-slide-toggle, .scheduler-dialog .mat-slide-toggle { width: 100%; } + #backup-options .hold-block mat-slide-toggle { display: initial; } + #backup-options .hold-block mat-slide-toggle .mat-slide-toggle-label { justify-content: space-between; } + .scheduler-dialog .mat-slide-toggle-label-before .mat-slide-toggle-label { justify-content: flex-end; } @@ -222,6 +252,7 @@ .mat-raised-button.mat-accent { background-color: #36afd5; } + .mat-slide-toggle.mat-checked .mat-ripple-element { background-color: #36afd5; } @@ -238,17 +269,20 @@ white-space: pre-line !important; word-break: break-all; } + .manage-roles, .project-form, .selection { .mat-form-field { width: 100%; } + .inner-step { .mat-select-value { width: 96%; } } + .list-selected { .mat-chip-list { .mat-chip-list-wrapper { @@ -257,6 +291,7 @@ } } } + .mat-reset { .mat-form-field-type-mat-select:not(.mat-form-field-disabled) { .mat-form-field-flex { @@ -264,9 +299,11 @@ // padding-top: 2px; } } + .mat-form-field { .mat-form-field-wrapper { overflow: hidden; + .mat-form-field-infix { width: 275px; border: 0; @@ -274,25 +311,31 @@ font-size: 15px; font-weight: 300; padding-top: 10px; + .mat-select-value-text { span { color: #607d8b; } } } + .mat-form-field-underline { display: none; } + .mat-select-arrow { color: transparent !important; } + .mat-form-field-label { padding-top: 0; color: #607d8b; + mat-label { vertical-align: middle; } } + .mat-select { &:focus { .mat-input-underline { @@ -300,6 +343,7 @@ background-color: transparent !important; } } + &:not(.mat-select-disabled) { .mat-select-arrow { color: transparent; @@ -308,23 +352,28 @@ } } } + .mat-input-wrapper.mat-form-field-wrapper .mat-form-field-underline { display: none; } } } + .mat-form-field-type-mat-chip-list { width: 100%; } + .mat-step-header { .mat-step-icon { background-color: #36afd5; } } + .mat-chip { background-color: rgba(47, 174, 215, 0.2) !important; color: #687e96; } + .roles { .selector-wrapper-edit { .mat-select-value { @@ -339,29 +388,35 @@ mat-horizontal-stepper { .mat-step-icon { background-color: #36afd5; } + .mat-step-label { font-family: 'Open Sans', sans-serif; font-size: 15px; font-weight: 300; } } + &.stepper { margin-top: 10px; + .inner-step { display: flex; justify-content: center; align-items: center; padding: 5px; + input { width: 100%; align-self: center; } + .caret { i { margin-top: 3px; } } } + .text-center { button { &:not(:last-child) { @@ -369,12 +424,15 @@ mat-horizontal-stepper { } } } + &.roles { height: 190px; flex-direction: column; text-align: center; + .inner-step { height: 70px; + input { width: 490px; } @@ -386,6 +444,7 @@ mat-horizontal-stepper { .multiple-select { border-bottom: 1px solid #dedbdb; padding: 0 !important; + a { display: inline-block; width: 50%; @@ -393,23 +452,28 @@ mat-horizontal-stepper { vertical-align: middle; color: #575757; cursor: pointer; + i { vertical-align: sub; font-size: 20px; } + &:hover { color: #4eaf3e; background: #f9fafb; } + &.deselect { &:hover { color: #f1696e; } } } + mat-pseudo-checkbox { display: none; } + &.empty { margin-left: 15px; } @@ -440,9 +504,11 @@ mat-horizontal-stepper { .error-modalbox { overflow: hidden; + .mat-dialog-container { overflow-x: hidden; padding: 0; + .content { color: #718ba6; padding: 20px 0; @@ -451,6 +517,7 @@ mat-horizontal-stepper { text-align: center; margin: 0; } + .dialog-header { position: relative; top: 0; @@ -459,14 +526,17 @@ mat-horizontal-stepper { height: 54px; line-height: 54px; } + .dialog-header h4 { color: #455c74; font-size: 18px; font-weight: 600; + i { vertical-align: sub; } } + .close { position: absolute; top: 0; @@ -481,9 +551,11 @@ mat-horizontal-stepper { cursor: pointer; transition: all 0.45s ease-in-out; } + .close:hover { color: #36afd5; } + .text-center button { margin-bottom: 25px; } @@ -497,15 +569,17 @@ mat-horizontal-stepper { font-weight: 600; color: #607D8B; } + .mat-cell { word-break: break-all; vertical-align: top; padding: 10px 5px; } + tr.mat-footer-row { font-weight: bold; } - + // .mat-table-sticky { // border-top: 1px solid #e0e0e0; // } @@ -513,10 +587,12 @@ mat-horizontal-stepper { mat-tab-group.mat-tab-group { height: 100%; + .mat-tab-body-wrapper { height: 100%; } } + mat-divider.mat-divider { margin: 10px 0; } @@ -525,6 +601,7 @@ mat-progress-bar { .mat-progress-bar-fill::after { background-color: #00BCD4; } + .mat-progress-bar-buffer { background-color: #baf0f7; } From 06d3b1dc8de00432825c0bf7472d6acc6b9ea22a Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 25 Jun 2019 16:09:07 +0300 Subject: [PATCH 215/357] DLAB-818 fixed bug connected with resource creation --- .../rest/mappers/ValidationExceptionMapper.java | 2 +- .../epam/dlab/backendapi/dao/ProjectDAO.java | 3 +++ .../dlab/backendapi/dao/ProjectDAOImpl.java | 17 +++++++++++++++++ .../epam/dlab/backendapi/domain/ProjectDTO.java | 2 ++ .../backendapi/resources/ProjectResource.java | 17 +++++++++++++++++ .../dlab/backendapi/service/ProjectService.java | 1 + .../service/impl/ProjectServiceImpl.java | 5 +++++ .../applicationServiceFacade.service.ts | 8 ++++++++ .../src/app/core/services/project.service.ts | 10 +++++++++- .../create-environment.component.ts | 6 +++++- 10 files changed, 68 insertions(+), 3 deletions(-) diff --git a/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/mappers/ValidationExceptionMapper.java b/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/mappers/ValidationExceptionMapper.java index 49ce81fb6f..700ce4dd97 100644 --- a/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/mappers/ValidationExceptionMapper.java +++ b/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/mappers/ValidationExceptionMapper.java @@ -36,7 +36,7 @@ public Response toResponse(JerseyViolationException exception) { final String errors = exception.getConstraintViolations() .stream().map(violation -> ConstraintMessage.getMessage(violation, invocable)) - .collect(Collectors.joining()); + .collect(Collectors.joining(",")); return Response.status(Response.Status.BAD_REQUEST) .entity(new ErrorDTO(Response.Status.BAD_REQUEST.getStatusCode(), errors)) .type(MediaType.APPLICATION_JSON) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index 35cfd1b6e7..2e2ab55b67 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -1,5 +1,6 @@ package com.epam.dlab.backendapi.dao; +import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.dto.base.project.ProjectEdgeInfo; @@ -10,6 +11,8 @@ public interface ProjectDAO { List getProjects(); + List getUserProjects(UserInfo userInfo); + void create(ProjectDTO projectDTO); void updateStatus(String projectName, ProjectDTO.Status status); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index c3a6752875..dd89e5d1b2 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -1,8 +1,11 @@ package com.epam.dlab.backendapi.dao; +import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.dto.base.project.ProjectEdgeInfo; import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import com.google.inject.Inject; import com.mongodb.BasicDBObject; import com.mongodb.client.result.UpdateResult; import org.bson.Document; @@ -22,11 +25,25 @@ public class ProjectDAOImpl extends BaseDAO implements ProjectDAO { private static final String STATUS_FIELD = "status"; private static final String EDGE_INFO_FIELD = "edgeInfo"; + private final UserGroupDao userGroupDao; + + @Inject + public ProjectDAOImpl(UserGroupDao userGroupDao) { + this.userGroupDao = userGroupDao; + } + + @Override public List getProjects() { return find(PROJECTS_COLLECTION, ProjectDTO.class); } + @Override + public List getUserProjects(UserInfo userInfo) { + return find(PROJECTS_COLLECTION, in(GROUPS, Sets.union(userGroupDao.getUserGroups(userInfo.getName()), + userInfo.getRoles())), ProjectDTO.class); + } + @Override public void create(ProjectDTO projectDTO) { insertOne(PROJECTS_COLLECTION, projectDTO); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index ac47bd86e1..4d836cc932 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import java.util.Set; @Data @@ -16,6 +17,7 @@ public class ProjectDTO { @NotNull private final Set groups; @NotNull + @Pattern(regexp = "^ssh-", message = "Wrong key format. Key should be in openSSH format") private final String key; @NotNull private final String tag; diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java index 36d078ca12..e8414a4def 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -98,6 +98,23 @@ public Response getProjects(@Parameter(hidden = true) @Auth UserInfo userInfo, .build(); } + @Operation(summary = "Get projects assigned to user", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Return information about projects", + content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = + @Schema(implementation = ProjectDTO.class))), + }) + @Path("/me") + @GET + @Produces(MediaType.APPLICATION_JSON) + public Response getUserProjects(@Parameter(hidden = true) @Auth UserInfo userInfo, + @Parameter(description = "Project name") + @PathParam("name") String name) { + return Response + .ok(projectService.getUserProjects(userInfo)) + .build(); + } + @Operation(summary = "Update project", tags = "project") @ApiResponses({ @ApiResponse(responseCode = "200", description = "Project is successfully updated"), diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index 03c979c0e7..3245144018 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -7,6 +7,7 @@ public interface ProjectService { List getProjects(); + List getUserProjects(UserInfo userInfo); void create(UserInfo userInfo, ProjectDTO projectDTO); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 0343583f04..637bdd3341 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -50,6 +50,11 @@ public List getProjects() { return projectDAO.getProjects(); } + @Override + public List getUserProjects(UserInfo userInfo) { + return projectDAO.getUserProjects(userInfo); + } + @Override public void create(UserInfo user, ProjectDTO projectDTO) { if (!projectDAO.get(projectDTO.getName()).isPresent()) { diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index 44353248ef..bec6ee96df 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -68,6 +68,7 @@ export class ApplicationServiceFacade { private static readonly DOWNLOAD_REPORT = 'download_report'; private static readonly SETTINGS = 'settings'; private static readonly PROJECT = 'project'; + private static readonly USER_PROJECT = 'project/me'; private static readonly ENDPOINT = 'endpoint'; private accessTokenKey: string = 'access_token'; private requestRegistry: Dictionary; @@ -527,6 +528,12 @@ export class ApplicationServiceFacade { null); } + public buildGetUserProjectsList(): Observable { + return this.buildRequest(RequestMethod.Get, + this.requestRegistry.Item(ApplicationServiceFacade.USER_PROJECT), + null); + } + public buildDeleteProject(param): Observable { return this.buildRequest(RequestMethod.Delete, this.requestRegistry.Item(ApplicationServiceFacade.PROJECT) + param, @@ -627,6 +634,7 @@ export class ApplicationServiceFacade { // project this.requestRegistry.Add(ApplicationServiceFacade.PROJECT, '/api/project'); this.requestRegistry.Add(ApplicationServiceFacade.ENDPOINT, '/api/endpoint'); + this.requestRegistry.Add(ApplicationServiceFacade.USER_PROJECT, '/api/project/me'); } private buildRequest(method: RequestMethod, url: string, body: any, opt?) { diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts index ff1736502d..bdb2dc4929 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts @@ -52,6 +52,14 @@ export class ProjectService { catchError(ErrorUtils.handleServiceError)); } + public getUserProjectsList(): Observable<{}> { + return this.applicationServiceFacade + .buildGetUserProjectsList() + .pipe( + map(response => response), + catchError(ErrorUtils.handleServiceError)); + } + public deleteProject(data): Observable<{}> { const url = `/${data}`; return this.applicationServiceFacade @@ -60,4 +68,4 @@ export class ProjectService { map(response => response), catchError(ErrorUtils.handleServiceError)); } -} \ No newline at end of file +} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts index 8eb8f9b3dd..6fc0b0717a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts @@ -60,7 +60,7 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { } ngOnInit() { - this.getProjects(); + this.getUserProjects(); this.initFormModel(); } @@ -68,6 +68,10 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { this.projectService.getProjectsList().subscribe((projects: any) => this.projects = projects); } + public getUserProjects() { + this.projectService.getUserProjectsList().subscribe((projects: any) => this.projects = projects); + } + public getTemplates($event, project) { this.endpoints = project.endpoints; this.userResourceService.getExploratoryTemplates($event.value).subscribe(templates => this.templates = templates); From fafb73435d95481191d761285a987830ba36a493 Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 25 Jun 2019 16:10:20 +0300 Subject: [PATCH 216/357] DLAB-000 added project service to provision conf --- .../com/epam/dlab/backendapi/modules/ProductionModule.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java index 3ba4d423cf..bfaac790c0 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java @@ -29,9 +29,11 @@ import com.epam.dlab.backendapi.core.commands.ICommandExecutor; import com.epam.dlab.backendapi.core.response.handlers.dao.CallbackHandlerDao; import com.epam.dlab.backendapi.core.response.handlers.dao.FileSystemCallbackHandlerDao; -import com.epam.dlab.backendapi.service.RestoreCallbackHandlerService; import com.epam.dlab.backendapi.service.CheckInactivityService; +import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.backendapi.service.RestoreCallbackHandlerService; import com.epam.dlab.backendapi.service.impl.CheckInactivityServiceImpl; +import com.epam.dlab.backendapi.service.impl.ProjectServiceImpl; import com.epam.dlab.backendapi.service.impl.RestoreCallbackHandlerServiceImpl; import com.epam.dlab.constants.ServiceConsts; import com.epam.dlab.mongo.MongoService; @@ -75,5 +77,6 @@ protected void configure() { bind(CallbackHandlerDao.class).to(FileSystemCallbackHandlerDao.class); bind(RestoreCallbackHandlerService.class).to(RestoreCallbackHandlerServiceImpl.class); bind(CheckInactivityService.class).to(CheckInactivityServiceImpl.class); + bind(ProjectService.class).to(ProjectServiceImpl.class); } } From cadbaf3baf81f1b66362103e2fa9ebb2cbb87980 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 25 Jun 2019 16:42:27 +0300 Subject: [PATCH 217/357] bug fixed --- .../src/edge/fabfile.py | 152 ++++++++++++ .../src/edge/scripts/configure_http_proxy.py | 52 +++++ .../scripts/configure_nginx_reverse_proxy.py | 63 +++++ .../src/edge/scripts/reupload_ssh_key.py | 71 ++++++ .../src/edge/templates/conf.d/proxy.conf | 28 +++ .../src/edge/templates/locations/emr.conf | 77 +++++++ .../src/edge/templates/locations/jupyter.conf | 29 +++ .../src/edge/templates/locations/rstudio.conf | 30 +++ .../src/edge/templates/locations/spark.conf | 123 ++++++++++ .../src/edge/templates/locations/tensor.conf | 31 +++ .../src/edge/templates/locations/ungit.conf | 29 +++ .../edge/templates/locations/zeppelin.conf | 28 +++ .../src/edge/templates/nginx.conf | 58 +++++ .../src/edge/templates/nginx_debian | 216 ++++++++++++++++++ .../src/edge/templates/nginx_redhat | 128 +++++++++++ .../src/edge/templates/squid.conf | 62 +++++ .../src/general/scripts/aws/edge_configure.py | 4 +- .../general/scripts/aws/project_prepare.py | 4 +- .../src/general/scripts/aws/ssn_configure.py | 1 - 19 files changed, 1180 insertions(+), 6 deletions(-) create mode 100644 infrastructure-provisioning/src/edge/fabfile.py create mode 100644 infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py create mode 100644 infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py create mode 100644 infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py create mode 100644 infrastructure-provisioning/src/edge/templates/conf.d/proxy.conf create mode 100644 infrastructure-provisioning/src/edge/templates/locations/emr.conf create mode 100644 infrastructure-provisioning/src/edge/templates/locations/jupyter.conf create mode 100644 infrastructure-provisioning/src/edge/templates/locations/rstudio.conf create mode 100644 infrastructure-provisioning/src/edge/templates/locations/spark.conf create mode 100644 infrastructure-provisioning/src/edge/templates/locations/tensor.conf create mode 100644 infrastructure-provisioning/src/edge/templates/locations/ungit.conf create mode 100644 infrastructure-provisioning/src/edge/templates/locations/zeppelin.conf create mode 100644 infrastructure-provisioning/src/edge/templates/nginx.conf create mode 100644 infrastructure-provisioning/src/edge/templates/nginx_debian create mode 100644 infrastructure-provisioning/src/edge/templates/nginx_redhat create mode 100644 infrastructure-provisioning/src/edge/templates/squid.conf diff --git a/infrastructure-provisioning/src/edge/fabfile.py b/infrastructure-provisioning/src/edge/fabfile.py new file mode 100644 index 0000000000..67001179e5 --- /dev/null +++ b/infrastructure-provisioning/src/edge/fabfile.py @@ -0,0 +1,152 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +import json +from fabric.api import * +import logging +import sys +import os +from dlab.fab import * +import traceback + + +def status(): + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + try: + local("~/scripts/{}.py".format('edge_status')) + except Exception as err: + traceback.print_exc() + append_result("Failed obtaining EDGE status.", str(err)) + sys.exit(1) + + +def run(): + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + try: + local("~/scripts/{}.py".format('edge_prepare')) + except Exception as err: + traceback.print_exc() + append_result("Failed preparing Edge node.", str(err)) + sys.exit(1) + + try: + local("~/scripts/{}.py".format('edge_configure')) + except Exception as err: + traceback.print_exc() + append_result("Failed configuring Edge node.", str(err)) + sys.exit(1) + + +# Main function for terminating EDGE node and exploratory environment if exists +def terminate(): + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + try: + local("~/scripts/{}.py".format('edge_terminate')) + except Exception as err: + traceback.print_exc() + append_result("Failed terminating Edge node.", str(err)) + sys.exit(1) + + +# Main function for stopping EDGE node +def stop(): + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + try: + local("~/scripts/{}.py".format('edge_stop')) + except Exception as err: + traceback.print_exc() + append_result("Failed stopping Edge node.", str(err)) + sys.exit(1) + + +# Main function for stopping EDGE node +def start(): + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + try: + local("~/scripts/{}.py".format('edge_start')) + except Exception as err: + traceback.print_exc() + append_result("Failed starting Edge node.", str(err)) + sys.exit(1) + + +def recreate(): + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + try: + local("~/scripts/{}.py".format('edge_prepare')) + except Exception as err: + traceback.print_exc() + append_result("Failed preparing Edge node.", str(err)) + sys.exit(1) + + try: + local("~/scripts/{}.py".format('edge_configure')) + except Exception as err: + traceback.print_exc() + append_result("Failed configuring Edge node.", str(err)) + sys.exit(1) + + +def reupload_key(): + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + try: + local("~/scripts/{}.py".format('reupload_ssh_key')) + except Exception as err: + traceback.print_exc() + append_result("Failed to reupload key on Edge node.", str(err)) + sys.exit(1) \ No newline at end of file diff --git a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py new file mode 100644 index 0000000000..bad50ad1f5 --- /dev/null +++ b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py @@ -0,0 +1,52 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +from fabric.api import * +from fabric.contrib.files import exists +from dlab.edge_lib import configure_http_proxy_server +import argparse +import json +import sys + +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('--additional_config', type=str, default='{"empty":"string"}') +args = parser.parse_args() + +############## +# Run script # +############## +if __name__ == "__main__": + print("Configure connections") + try: + env['connection_attempts'] = 100 + env.key_filename = [args.keyfile] + env.host_string = '{}@{}'.format(args.user, args.hostname) + deeper_config = json.loads(args.additional_config) + except: + sys.exit(2) + + print("Installing proxy for notebooks.") + configure_http_proxy_server(deeper_config) diff --git a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py new file mode 100644 index 0000000000..b7123a32f6 --- /dev/null +++ b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py @@ -0,0 +1,63 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +import logging +from fabric.api import * +import argparse +import sys +import os +from dlab.edge_lib import install_nginx_ldap + +parser = argparse.ArgumentParser() +parser.add_argument('--hostname', type=str, default='') +parser.add_argument('--keyfile', type=str, default='') +parser.add_argument('--user', type=str, default='') +args = parser.parse_args() + +if __name__ == "__main__": + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], + os.environ['edge_user_name'], + os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + print("Configure connections") + try: + env['connection_attempts'] = 100 + env.key_filename = [args.keyfile] + env.host_string = '{}@{}'.format(args.user, args.hostname) + except Exception as err: + print("Failed establish connection. Excpeption: " + 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'], os.environ['aws_iam_user']) + except Exception as err: + print("Failed install nginx reverse proxy: " + str(err)) + sys.exit(1) + diff --git a/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py b/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py new file mode 100644 index 0000000000..b853af5955 --- /dev/null +++ b/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py @@ -0,0 +1,71 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +import os +import sys +import logging +import traceback +from dlab.fab import * +from dlab.meta_lib import * +from dlab.actions_lib import * +from fabric.api import * +import multiprocessing + +if __name__ == "__main__": + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + try: + if os.environ['conf_cloud_provider'] == 'aws': + create_aws_config_files() + logging.info('[REUPLOADING USER SSH KEY]') + print('[REUPLOADING USER SSH KEY]') + reupload_config = dict() + reupload_config['os_user'] = os.environ['conf_os_user'] + reupload_config['edge_user_name'] = os.environ['edge_user_name'] + reupload_config['keyfile'] = '{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) + reupload_config['resource_id'] = os.environ['resource_id'] + reupload_config['additional_config'] = {"user_keyname": reupload_config['edge_user_name'], + "user_keydir": os.environ['conf_key_dir']} + print(reupload_config) + try: + params = "--conf_resource {} --instance_id {} --os_user '{}'" \ + " --keyfile '{}' --additional_config '{}'".format( + os.environ['conf_resource'], reupload_config['resource_id'], + reupload_config['os_user'], reupload_config['keyfile'], + json.dumps(reupload_config['additional_config'])) + local("~/scripts/{}.py {}".format('common_reupload_key', params)) + except Exception as err: + traceback.print_exc() + raise Exception + except Exception as err: + append_result("Failed to reupload user ssh key.", str(err)) + sys.exit(1) + + with open("/root/result.json", 'w') as result: + res = {"Action": "Reupload user ssh key"} + result.write(json.dumps(res)) \ No newline at end of file diff --git a/infrastructure-provisioning/src/edge/templates/conf.d/proxy.conf b/infrastructure-provisioning/src/edge/templates/conf.d/proxy.conf new file mode 100644 index 0000000000..3c4602977e --- /dev/null +++ b/infrastructure-provisioning/src/edge/templates/conf.d/proxy.conf @@ -0,0 +1,28 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +server { + listen 80; + server_name EDGE_IP; + auth_ldap "Forbidden"; + auth_ldap_servers ldap1; + + include locations/*.conf; +} diff --git a/infrastructure-provisioning/src/edge/templates/locations/emr.conf b/infrastructure-provisioning/src/edge/templates/locations/emr.conf new file mode 100644 index 0000000000..56f1a2957c --- /dev/null +++ b/infrastructure-provisioning/src/edge/templates/locations/emr.conf @@ -0,0 +1,77 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +location /{{ CLUSTER_NAME }}/ { + rewrite ^/{{ CLUSTER_NAME }}/{{ CLUSTER_NAME }}/(.*)$ /$1 break; + rewrite ^/{{ CLUSTER_NAME }}/(.*)$ /$1 break; + proxy_pass http://{{ MASTER_IP }}:8088; + proxy_redirect http://{{ MASTER_IP }}:8088/ $scheme://$host/{{ CLUSTER_NAME }}/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter_types *; + sub_filter_once off; + sub_filter '/static/' '/{{ CLUSTER_NAME }}/static/'; + sub_filter '/cluster/' '/{{ CLUSTER_NAME }}/cluster/'; + sub_filter '/conf' '/{{ CLUSTER_NAME }}/conf'; + sub_filter '/logs' '/{{ CLUSTER_NAME }}/logs'; + sub_filter '/stacks' '/{{ CLUSTER_NAME }}/stacks'; + sub_filter '/jmx' '/{{ CLUSTER_NAME }}/jmx'; + sub_filter '//{{ MASTER_DNS }}:20888' '//$host/{{ CLUSTER_NAME }}-application'; + sub_filter '//{{ MASTER_DNS }}:8088' '//$host/{{ CLUSTER_NAME }}'; + {% for item in slaves %} + sub_filter '//{{ item.dns }}:8042' '//$host/{{ CLUSTER_NAME }}-{{ item.name }}'; + {% endfor %} +} + +location /{{ CLUSTER_NAME }}-application/ { + rewrite ^/{{ CLUSTER_NAME }}-application/(.*)$ /$1 break; + proxy_pass http://{{ MASTER_IP }}:20888; + proxy_redirect http://{{ MASTER_IP }}:20888/ $scheme://$host/{{ CLUSTER_NAME }}-application/; + proxy_http_version 1.1; + proxy_set_header Accept-Encoding ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter_types *; + sub_filter_once off; + sub_filter '/proxy/' '/{{ CLUSTER_NAME }}-application/proxy/'; +} + +{% for item in slaves %} +location /{{ CLUSTER_NAME }}-{{ item.name }}/ { + rewrite ^/{{ CLUSTER_NAME }}-{{ item.name }}/(.*)$ /$1 break; + proxy_pass http://{{ item.ip }}:8042; + proxy_redirect http://{{ item.ip }}:8042/ $scheme://$host/{{ CLUSTER_NAME }}-{{ item.name }}/; + proxy_http_version 1.1; + proxy_set_header Accept-Encoding ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter_types *; + sub_filter_once off; + sub_filter '/static/' '/{{ CLUSTER_NAME }}-{{ item.name }}/static/'; + sub_filter '/node/' '/{{ CLUSTER_NAME }}-{{ item.name }}/node/'; + sub_filter '/conf' '/{{ CLUSTER_NAME }}-{{ item.name }}/conf'; + sub_filter '/logs' '/{{ CLUSTER_NAME }}-{{ item.name }}/logs'; + sub_filter '/stacks' '/{{ CLUSTER_NAME }}-{{ item.name }}/stacks'; + sub_filter '/jmx' '/{{ CLUSTER_NAME }}-{{ item.name }}/jmx'; + sub_filter '//{{ MASTER_DNS }}:8088' '//$host/{{ CLUSTER_NAME }}/'; +} + +{% endfor %} diff --git a/infrastructure-provisioning/src/edge/templates/locations/jupyter.conf b/infrastructure-provisioning/src/edge/templates/locations/jupyter.conf new file mode 100644 index 0000000000..56f98ed39c --- /dev/null +++ b/infrastructure-provisioning/src/edge/templates/locations/jupyter.conf @@ -0,0 +1,29 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +location ~* /{{ NAME }}/.* { + proxy_pass http://{{ IP }}:8888; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; +} diff --git a/infrastructure-provisioning/src/edge/templates/locations/rstudio.conf b/infrastructure-provisioning/src/edge/templates/locations/rstudio.conf new file mode 100644 index 0000000000..4c63f97d39 --- /dev/null +++ b/infrastructure-provisioning/src/edge/templates/locations/rstudio.conf @@ -0,0 +1,30 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +location /{{ NAME }}/ { + rewrite ^/{{ NAME }}/(.*)$ /$1 break; + proxy_pass http://{{ IP }}:8787; + proxy_redirect http://{{ IP }}:8787/ $scheme://$host/{{ NAME }}/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_read_timeout 20d; +} + diff --git a/infrastructure-provisioning/src/edge/templates/locations/spark.conf b/infrastructure-provisioning/src/edge/templates/locations/spark.conf new file mode 100644 index 0000000000..554de783b3 --- /dev/null +++ b/infrastructure-provisioning/src/edge/templates/locations/spark.conf @@ -0,0 +1,123 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** +location /{{ CLUSTER_NAME }}/ { + rewrite ^/{{ CLUSTER_NAME }}/(.*)$ /$1 break; + proxy_pass http://{{ MASTER_IP }}:8080; + proxy_redirect http://{{ MASTER_IP }}:8080/ $scheme://$host/{{ CLUSTER_NAME }}/; + proxy_set_header Accept-Encoding ""; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter_types *; + sub_filter_once off; + sub_filter '/static/' '/{{ CLUSTER_NAME }}/static/'; + sub_filter '/app/' '/{{ CLUSTER_NAME }}/app/'; + sub_filter ' /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON -- \ + $DAEMON_OPTS 2>/dev/null \ + || return 2 +} + +test_config() { + # Test the nginx configuration + $DAEMON -t $DAEMON_OPTS >/dev/null 2>&1 +} + +stop_nginx() { + # Stops the daemon/service + # + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=$STOP_SCHEDULE --pidfile $PID --name $NAME + RETVAL="$?" + sleep 1 + return "$RETVAL" +} + +reload_nginx() { + # Function that sends a SIGHUP to the daemon/service + start-stop-daemon --stop --signal HUP --quiet --pidfile $PID --name $NAME + return 0 +} + +rotate_logs() { + # Rotate log files + start-stop-daemon --stop --signal USR1 --quiet --pidfile $PID --name $NAME + return 0 +} + +upgrade_nginx() { + # Online upgrade nginx executable + # http://nginx.org/en/docs/control.html + # + # Return + # 0 if nginx has been successfully upgraded + # 1 if nginx is not running + # 2 if the pid files were not created on time + # 3 if the old master could not be killed + if start-stop-daemon --stop --signal USR2 --quiet --pidfile $PID --name $NAME; then + # Wait for both old and new master to write their pid file + while [ ! -s "${PID}.oldbin" ] || [ ! -s "${PID}" ]; do + cnt=`expr $cnt + 1` + if [ $cnt -gt 10 ]; then + return 2 + fi + sleep 1 + done + # Everything is ready, gracefully stop the old master + if start-stop-daemon --stop --signal QUIT --quiet --pidfile "${PID}.oldbin" --name $NAME; then + return 0 + else + return 3 + fi + else + return 1 + fi +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + start_nginx + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + stop_nginx + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + restart) + log_daemon_msg "Restarting $DESC" "$NAME" + + # Check configuration before stopping nginx + if ! test_config; then + log_end_msg 1 # Configuration error + exit $? + fi + + stop_nginx + case "$?" in + 0|1) + start_nginx + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + reload|force-reload) + log_daemon_msg "Reloading $DESC configuration" "$NAME" + + # Check configuration before stopping nginx + # + # This is not entirely correct since the on-disk nginx binary + # may differ from the in-memory one, but that's not common. + # We prefer to check the configuration and return an error + # to the administrator. + if ! test_config; then + log_end_msg 1 # Configuration error + exit $? + fi + + reload_nginx + log_end_msg $? + ;; + configtest|testconfig) + log_daemon_msg "Testing $DESC configuration" + test_config + log_end_msg $? + ;; + status) + status_of_proc -p $PID "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + upgrade) + log_daemon_msg "Upgrading binary" "$NAME" + upgrade_nginx + log_end_msg $? + ;; + rotate) + log_daemon_msg "Re-opening $DESC log files" "$NAME" + rotate_logs + log_end_msg $? + ;; + *) + echo "Usage: $NAME {start|stop|restart|reload|force-reload|status|configtest|rotate|upgrade}" >&2 + exit 3 + ;; +esac diff --git a/infrastructure-provisioning/src/edge/templates/nginx_redhat b/infrastructure-provisioning/src/edge/templates/nginx_redhat new file mode 100644 index 0000000000..8f2c4c956a --- /dev/null +++ b/infrastructure-provisioning/src/edge/templates/nginx_redhat @@ -0,0 +1,128 @@ +#!/bin/sh +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +# +# nginx - this script starts and stops the nginx daemon +# +# chkconfig: - 85 15 +# description: Nginx is an HTTP(S) server, HTTP(S) reverse \ +# proxy and IMAP/POP3 proxy server +# processname: nginx +# config: /etc/nginx/nginx.conf +# pidfile: /var/run/nginx.pid +# user: nginx + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Check that networking is up. +[ "$NETWORKING" = "no" ] && exit 0 + +nginx="/usr/sbin/nginx" +prog=$(basename $nginx) + +NGINX_CONF_FILE="/etc/nginx/nginx.conf" + +lockfile=/var/run/nginx.lock + +start() { + [ -x $nginx ] || exit 5 + [ -f $NGINX_CONF_FILE ] || exit 6 + echo -n $"Starting $prog: " + daemon $nginx -c $NGINX_CONF_FILE + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc $prog -QUIT + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + configtest || return $? + stop + start +} + +reload() { + configtest || return $? + echo -n $"Reloading $prog: " + killproc $nginx -HUP + RETVAL=$? + echo +} + +force_reload() { + restart +} + +configtest() { + $nginx -t -c $NGINX_CONF_FILE +} + +rh_status() { + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart|configtest) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}" + exit 2 +esac diff --git a/infrastructure-provisioning/src/edge/templates/squid.conf b/infrastructure-provisioning/src/edge/templates/squid.conf new file mode 100644 index 0000000000..0129e00d08 --- /dev/null +++ b/infrastructure-provisioning/src/edge/templates/squid.conf @@ -0,0 +1,62 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +auth_param basic program LDAP_AUTH_PATH -b "LDAP_DN" -D "LDAP_SERVICE_USERNAME,LDAP_DN" -w LDAP_SERVICE_PASSWORD -f uid=%s LDAP_HOST + +acl DLab_user_src_subnet src PROXY_SUBNET +VPC_CIDRS +ALLOWED_CIDRS + + +acl SSL_ports port 443 +acl Safe_ports port 80 # http +acl Safe_ports port 21 # ftp +acl Safe_ports port 22 # ssh +acl Safe_ports port 443 # https +acl Safe_ports port 70 # gopher +acl Safe_ports port 210 # wais +acl Safe_ports port 1025-65535 # unregistered ports +acl Safe_ports port 280 # http-mgmt +acl Safe_ports port 488 # gss-http +acl Safe_ports port 591 # filemaker +acl Safe_ports port 777 # multiling http +acl CONNECT method CONNECT + +acl ldap-auth proxy_auth EDGE_USER_NAME + +http_access deny !Safe_ports +http_access allow localhost manager +http_access deny manager +http_access allow DLab_user_src_subnet +http_access allow AllowedCIDRS ldap-auth +http_access allow localhost +http_access deny all + +http_port 3128 + +cache deny all +cache_dir null /tmp +coredump_dir /var/spool/squid + +refresh_pattern ^ftp: 1440 20% 10080 +refresh_pattern ^gopher: 1440 0% 1440 +refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 +refresh_pattern . 0 20% 4320 diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index 4c971bdbe7..b19302309a 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -74,7 +74,7 @@ edge_conf['vpc_cidrs'] = list(set(edge_conf['vpc1_cidrs'] + edge_conf['vpc2_cidrs'])) except KeyError: edge_conf['vpc_cidrs'] = list(set(edge_conf['vpc1_cidrs'])) - edge_conf['vpc_cidrs'] = list(set(edge_conf['vpc1_cidrs'] + edge_conf['vpc2_cidrs'])) + edge_conf['allowed_ip_cidr'] = list() for cidr in os.environ['conf_allowed_ip_cidr'].split(','): edge_conf['allowed_ip_cidr'].append(cidr.replace(' ', '')) @@ -141,7 +141,7 @@ logging.info('[INSTALLING HTTP PROXY]') additional_config = {"exploratory_subnet": edge_conf['private_subnet_cidr'], "template_file": "/root/templates/squid.conf", -# "edge_user_name": os.environ['aws_iam_user'], + "project_name": os.environ['project_name'], "ldap_host": os.environ['ldap_hostname'], "ldap_dn": os.environ['ldap_dn'], "ldap_user": os.environ['ldap_service_username'], diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py index 5c0d75af59..589d17c3bc 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py @@ -103,7 +103,7 @@ os.environ['conf_user_subnets_range'] = '' # FUSE in case of absence of user's key - try + try: project_conf['user_key'] = os.environ['key'] except KeyError: print("ADMINSs PUBLIC KEY DOES NOT UPLOADED") @@ -485,8 +485,6 @@ project_conf['region'], project_conf['bucket_name_tag']) try: local("~/scripts/{}.py {}".format('common_create_bucket', params)) - bucket = get_bucket_by_name(project_conf['bucket_name']) - create_tag(bucket, project_tag) except: traceback.print_exc() raise Exception diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py index 3801dcd8c0..8abb0b1dd1 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py @@ -262,7 +262,6 @@ print('[CONFIGURING DOCKER AT SSN INSTANCE]') additional_config = [{"name": "base", "tag": "latest"}, {"name": "project", "tag": "latest"}, - {"name": "edge", "tag": "latest"}, {"name": "jupyter", "tag": "latest"}, {"name": "rstudio", "tag": "latest"}, {"name": "zeppelin", "tag": "latest"}, From f4b18fc0da554f0d5b244cef1e75e99bb700bcf3 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 25 Jun 2019 16:50:16 +0300 Subject: [PATCH 218/357] project termination bug fixed --- .../src/general/scripts/aws/project_terminate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py index a27ef9095b..ec32b58201 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py @@ -55,7 +55,7 @@ def terminate_edge_node(tag_name, project_tag, tag_value, nb_sg, edge_sg, de_sg, print("Removing s3 bucket") try: - remove_s3('edge', project_name) + remove_s3('edge', project_tag) except: sys.exit(1) From ba52e723ad89cbf9fc1346b56e3708cd79849ede Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 25 Jun 2019 17:07:07 +0300 Subject: [PATCH 219/357] [DLAB-652]: added asign project parameter to model --- .../src/app/administration/management/management.model.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts index 51ab7212da..641e098cb9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts @@ -32,9 +32,9 @@ export class EnvironmentModel { export class BackupOptionsModel { constructor( public configFiles: Array, - public keys: Array, - public certificates: Array, - public jars: Array, + public keys: Array, + public certificates: Array, + public jars: Array, public databaseBackup: boolean, public logsBackup: boolean ) { } @@ -55,4 +55,5 @@ export interface GeneralEnvironmentStatus { billingQuoteUsed: number; list_resources: any; status: string; + projectAssigned: boolean; } From 6ba580a8c58183936d3e79793c9e2b6f969a6757 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 25 Jun 2019 17:08:52 +0300 Subject: [PATCH 220/357] [DLAB-652]: disabled environment creation if user not assignet to any project --- .../webapp/src/app/resources/resources.component.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index be44a59371..c4fdad870c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -19,7 +19,8 @@
-
@@ -41,4 +42,4 @@
- \ No newline at end of file + From 4ccff545714b764142131caa81dd000c8ec6ea64 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 25 Jun 2019 17:16:08 +0300 Subject: [PATCH 221/357] [DLAB-652]: added check assignment to project; add inform dialog fading --- .../app/shared/navbar/navbar.component.html | 3 +- .../src/app/shared/navbar/navbar.component.ts | 43 +++++++++++-------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index b7eec53130..10abf9c49f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -35,8 +35,7 @@ radio_button_checked - - + info diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts index 18b8f0dd92..af6958df92 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts @@ -70,6 +70,7 @@ export class NavbarComponent implements OnInit, OnDestroy { this.subscriptions.add(this.healthStatusService.statusData.subscribe(result => { this.healthStatus = result; result.status && this.checkQuoteUsed(this.healthStatus); + result.status && !result.projectAssigned && this.checkAssignment(this.healthStatus); })); this.subscriptions.add(timer(0, this.CHECK_ACTIVE_SCHEDULE_TIMEOUT).subscribe(() => this.refreshSchedulerData())); this.currentUserName = this.getUserName(); @@ -102,7 +103,7 @@ export class NavbarComponent implements OnInit, OnDestroy { public emitQuotes(alert, user_quota?, total_quota?): void { const dialogRef: MatDialogRef = this.dialog.open(NotificationDialogComponent, { - data: { template: this.selectQuotesAlert(alert, user_quota, total_quota), type: 'message' }, + data: { template: this.selectAlert(alert, user_quota, total_quota), type: 'message' }, width: '550px' }); dialogRef.afterClosed().subscribe(() => { @@ -124,22 +125,27 @@ export class NavbarComponent implements OnInit, OnDestroy { } } + private checkAssignment(params): void { + if (this.dialog.openDialogs.length > 0) return; + this.emitQuotes('permissions'); + } + private refreshSchedulerData(): void { - this.schedulerService.getActiveSchcedulersData(this.CHECK_ACTIVE_SCHEDULE_PERIOD).subscribe((list: Array) => { - if (list.length) { - if (this.dialog.openDialogs.length > 0) return; - const filteredData = this.groupSchedulerData(list); - this.dialog.open(NotificationDialogComponent, { - data: { template: filteredData, type: 'list' }, - width: '550px' - }); - } + this.schedulerService.getActiveSchcedulersData(this.CHECK_ACTIVE_SCHEDULE_PERIOD).subscribe((list: Array) => { + if (list.length) { + if (this.dialog.openDialogs.length > 0) return; + const filteredData = this.groupSchedulerData(list); + this.dialog.open(NotificationDialogComponent, { + data: { template: filteredData, type: 'list' }, + width: '550px' + }); + } }); } private groupSchedulerData(sheduler_data) { const memo = { notebook: [], cluster: [] }; - sheduler_data.map(item => !item.computational_name ? memo.notebook.push(item) : memo.cluster.push(item)); + sheduler_data.map(item => !item.computational_name ? memo.notebook.push(item) : memo.cluster.push(item)); memo.cluster = memo.cluster.filter(el => !memo.notebook.some(elm => el.exploratory_name === elm.exploratory_name)); return memo; } @@ -153,24 +159,27 @@ export class NavbarComponent implements OnInit, OnDestroy { }); } - private selectQuotesAlert(type: string, user_quota?: number, total_quota?: number): string { + private selectAlert(type: string, user_quota?: number, total_quota?: number): string { const alerts = { - user_exceed: `Dear ${ this.currentUserName },
+ user_exceed: `Dear ${this.currentUserName},
DLab cloud infrastructure usage quota associated with your user has been exceeded. All your analytical environment will be stopped. To proceed working with environment, request increase of user quota from DLab administrator.`, - total_exceed: `Dear ${ this.currentUserName },
+ total_exceed: `Dear ${this.currentUserName},
DLab cloud infrastructure usage quota has been exceeded. All your analytical environment will be stopped. To proceed working with environment, request increase application quota from DLab administrator.`, - user_quota: `Dear ${ this.currentUserName },
+ user_quota: `Dear ${this.currentUserName},
Cloud infrastructure usage quota associated with your user has been used for ${user_quota}%. Once quota is depleted all your analytical environment will be stopped. To proceed working with environment you'll have to request increase of user quota from DLab administrator.`, - total_quota: `Dear ${ this.currentUserName },
+ total_quota: `Dear ${this.currentUserName},
DLab cloud infrastructure usage quota has been used for ${total_quota}%. Once quota is depleted all your analytical environment will be stopped. - To proceed working with environment you'll have to request increase of user quota from DLab administrator. ` + To proceed working with environment you'll have to request increase of user quota from DLab administrator. `, + permissions: `Dear ${this.currentUserName},
+ Currently, you are not assigned to any project. To start working with the environment + request permission from DLab administrator.` }; return alerts[type]; From 5ef0b61c768a11783ae3b807e7e854fe58b010bf Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 25 Jun 2019 17:17:35 +0300 Subject: [PATCH 222/357] [DLAB-652]: update health status check after applying action --- .../administration/roles/roles.component.ts | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts index 16e5a67f1e..a47c9ee3e6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts @@ -44,7 +44,7 @@ export class RolesComponent implements OnInit { public healthStatus: any; public delimitersRegex = /[-_]?/g; public groupnamePattern = new RegExp(/^[a-zA-Z0-9_\-]+$/); - + stepperView: boolean = false; displayedColumns: string[] = ['name', 'roles', 'users', 'actions']; @Output() manageRolesGroupAction: EventEmitter<{}> = new EventEmitter(); @@ -57,8 +57,8 @@ export class RolesComponent implements OnInit { ) { } ngOnInit() { - this.openManageRolesDialog(); - this.getEnvironmentHealthStatus(); + this.openManageRolesDialog(); + this.getEnvironmentHealthStatus(); } openManageRolesDialog() { @@ -68,12 +68,12 @@ export class RolesComponent implements OnInit { this.roles = roles; this.rolesList = roles.map(role => role.description); this.updateGroupData(groups); - + this.stepperView = false; }, error => this.toastr.error(error.message, 'Oops!')); }, - error => this.toastr.error(error.message, 'Oops!')); + error => this.toastr.error(error.message, 'Oops!')); } getGroupsData() { @@ -89,15 +89,16 @@ export class RolesComponent implements OnInit { public manageAction(action: string, type: string, item?: any, value?) { if (action === 'create') { this.manageRolesGroups( - { action, type, value: { - name: this.setupGroup, - users: this.setupUser ? this.setupUser.split(',').map(elem => elem.trim()) : [], - roleIds: this.extractIds(this.roles, this.setupRoles) - } - }); + { + action, type, value: { + name: this.setupGroup, + users: this.setupUser ? this.setupUser.split(',').map(elem => elem.trim()) : [], + roleIds: this.extractIds(this.roles, this.setupRoles) + } + }); this.stepperView = false; } else if (action === 'delete') { - const data = (type === 'users') ? {group: item.group, user: value} : {group: item.group, id: item}; + const data = (type === 'users') ? { group: item.group, user: value } : { group: item.group, id: item }; const dialogRef: MatDialogRef = this.dialog.open( ConfirmDeleteUserAccountDialogComponent, { data: data, width: '550px', panelClass: 'error-modalbox' } @@ -106,17 +107,21 @@ export class RolesComponent implements OnInit { dialogRef.afterClosed().subscribe(result => { if (result) { const emitValue = (type === 'users') - ? {action, type, id: item.name, value: { user: value, group: item.group }} - : {action, type, id: item.name, value: item.group} ; + ? { action, type, id: item.name, value: { user: value, group: item.group } } + : { action, type, id: item.name, value: item.group }; this.manageRolesGroups(emitValue); } }); } else if (action === 'update') { - this.manageRolesGroups({action, type, value: { - name: item.group, - roleIds: this.extractIds(this.roles, item.selected_roles), - users: item.users || [] }}); + this.manageRolesGroups({ + action, type, value: { + name: item.group, + roleIds: this.extractIds(this.roles, item.selected_roles), + users: item.users || [] + } + }); } + this.getEnvironmentHealthStatus(); this.resetDialog(); } @@ -151,7 +156,7 @@ export class RolesComponent implements OnInit { default: } } - + public extractIds(sourceList, target) { return sourceList.reduce((acc, item) => { target.includes(item.description) && acc.push(item._id); From da89acc02e80c3144436b994ba15392abb904c7f Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 26 Jun 2019 13:48:05 +0300 Subject: [PATCH 223/357] project_name added to response file --- .../src/general/scripts/aws/edge_configure.py | 1 + 1 file changed, 1 insertion(+) diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index b19302309a..c215fd2738 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -245,6 +245,7 @@ "edge_sg": edge_conf['edge_security_group_name'], "notebook_subnet": edge_conf['private_subnet_cidr'], "full_edge_conf": edge_conf, + "project_name": os.environ['project_name'], "Action": "Create new EDGE server"} print(json.dumps(res)) result.write(json.dumps(res)) From 8e1d52b27cd6dccb3103171fac3707169c7ef5dc Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 26 Jun 2019 15:35:38 +0300 Subject: [PATCH 224/357] [DLAB-821]: removed extra scrollbar on creating project dialog --- .../webapp/src/app/administration/project/project.component.ts | 2 +- .../computational-resource-create-dialog.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index c41ab275f2..dc888cff58 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -115,7 +115,7 @@ export class ProjectComponent implements OnInit, OnDestroy { `, styles: [` .content { color: #718ba6; padding: 0; font-size: 14px; font-weight: 400; margin: 0; overflow: hidden; } - .edit-form { height: 380px; } + .edit-form { height: 380px; overflow: hidden; } `] }) export class EditProjectComponent { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index 627b7dea2b..79822d80ca 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -170,7 +170,7 @@

Add computational resources

From d4517c91be9d96bc048c14a793b086fe63d68691 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 26 Jun 2019 15:37:58 +0300 Subject: [PATCH 225/357] [DLAB-822]: fixed key uploading on initial project creation form --- .../webapp/src/assets/styles/_dialogs.scss | 174 ++++++++++++------ 1 file changed, 113 insertions(+), 61 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss index 311048c7a8..46aef3b416 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss @@ -17,30 +17,58 @@ * under the License. */ - @import '_variables.scss'; - - .modal-xs { width: 375px; } - .modal-sm { width: 525px; } - .modal-md { width: 545px; } - .modal-lg { width: 580px; } - .modal-xl-s { width: 660px; } - .modal-xl { width: 900px; } - .modal-xxl { width: 1000px; } - .modal-fullscreen { width: 100vw; height: 100vh;} - +@import '_variables.scss'; + +.modal-xs { + width: 375px; +} + +.modal-sm { + width: 525px; +} + +.modal-md { + width: 545px; +} + +.modal-lg { + width: 580px; +} + +.modal-xl-s { + width: 660px; +} + +.modal-xl { + width: 900px; +} + +.modal-xxl { + width: 1000px; +} + +.modal-fullscreen { + width: 100vw; + height: 100vh; +} + mat-dialog-container { overflow-x: hidden; + &.mat-dialog-container { padding: 0; border-radius: 0; + #dialog-box { color: $modal-text-color; + .dialog-header { padding-left: 30px; background: $modal-header-color; height: 50px; line-height: 50px; position: relative; + .modal-title { width: 90%; margin: 0; @@ -51,10 +79,12 @@ mat-dialog-container { color: #455c74; font-size: 18px; background: $modal-header-color; + i { vertical-align: middle; } } + .close { position: absolute; top: 0; @@ -69,101 +99,65 @@ mat-dialog-container { outline: none; cursor: pointer; transition: all .45s ease-in-out; + &:hover { color: #36afd5; } } + &.header-white { background: #fff; } } - + .dialog-body { padding-top: 0; } + .upload-key { margin-bottom: 20px; - & > div > div { + + &>div>div { margin-top: 5px; } - - .butt-file { - position: relative; - overflow: hidden; - margin-bottom: 10px; - display: inline-block; - color: #35afd5; - padding: 6px 29px 6px 23px; - width: 170px; - // font: 600 16px/1.45 'Open Sans'; - font-style: normal; - font-weight: 600; - font-size: 16px; - line-height: 1.45; - font-family:'Open Sans', sans-serif; - - text-align: center; - box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12); - .upload-icon { - background: url(/../../assets/img/upload-icon.png) no-repeat; - background-size: 100%; - display: inline-block; - width: 17px; - height: 17px; - margin-right: 8px; - position: relative; - top: 2px; - } - input[type=file] { - width: 100%; - height: 100%; - position: absolute; - top: 0; - right: 0; - min-width: 100%; - min-height: 100%; - font-size: 100px; - text-align: right; - opacity: 0; - outline: none; - background: #fff; - cursor: inherit; - display: block; - } - &:active { - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); - } - } + .butt-generate { color: #35afd5; width: 170px; } } + .btn-success { margin-left: 40px; margin-right: 2px; } + .btn { padding: 6px 15px; min-width: 140px; font-weight: 600; } + a { color: #35afd5; text-decoration: none; transition: all .45s ease-in-out; + &:hover { color: #5faec7; } } + .info-label { font-size: 15px; margin-top: 20px; } + .control-label { font-weight: 600; margin-top: 6px; } + .form-group { small { font-size: 12px; @@ -175,22 +169,75 @@ mat-dialog-container { } } } + .content-box { padding: 25px 30px 35px; } +.butt-file { + position: relative; + overflow: hidden; + margin-bottom: 10px; + display: inline-block; + color: #35afd5; + padding: 6px 29px 6px 23px; + width: 170px; + // font: 600 16px/1.45 'Open Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 1.45; + font-family: 'Open Sans', sans-serif; + + text-align: center; + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12); + + .upload-icon { + background: url(/../../assets/img/upload-icon.png) no-repeat; + background-size: 100%; + display: inline-block; + width: 17px; + height: 17px; + margin-right: 8px; + position: relative; + top: 2px; + } + + input[type=file] { + width: 100%; + height: 100%; + position: absolute; + top: 0; + right: 0; + min-width: 100%; + min-height: 100%; + font-size: 100px; + text-align: right; + opacity: 0; + outline: none; + background: #fff; + cursor: inherit; + display: block; + } + + &:active { + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + } +} .detail-header { border-bottom: 0; width: 100%; border-collapse: collapse; table-layout: fixed; + td { border: 1px solid #edf1f5; text-align: center; padding: 20px; text-align: center !important; background: #fff; + &:first-child { background: #f6fafe; font-size: 16px; @@ -200,6 +247,7 @@ mat-dialog-container { overflow: hidden; cursor: default; } + &.tooltip-wrap { .hint-title { font-size: 16px; @@ -216,20 +264,24 @@ mat-dialog-container { p { font-weight: 400; margin-bottom: 10px; + small { font-size: 12px; font-weight: 400; } } + span { font-size: 14px; overflow: hidden; text-overflow: ellipsis; display: block; } + .links_block { padding-left: 25px; } + .time_info { margin-top: 15px; } From 790faa6ca28f76c4e64b54f904c353383b387b29 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 26 Jun 2019 15:38:19 +0300 Subject: [PATCH 226/357] [DLAB-822]: fixed key uploading on initial project creation form --- .../webapp/src/assets/styles/_reset.scss | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_reset.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_reset.scss index 1773d70f3a..8875e14a08 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_reset.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_reset.scss @@ -20,7 +20,7 @@ * { box-sizing: border-box; margin: 0; - padding: 0; + padding: 0; } body { @@ -28,21 +28,36 @@ body { } /* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { display: block; } -ol, ul { - list-style: none; +ol, +ul { + list-style: none; +} + +a { + text-decoration: none } table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } -[hidden], .hidden { +[hidden], +.hidden { display: none !important; } @@ -83,6 +98,7 @@ table { } input { + &::-ms-clear, &::-ms-reveal { display: none; From 511ce8845ded84504649db4ba786f7aaf3da7f68 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 27 Jun 2019 12:44:08 +0300 Subject: [PATCH 227/357] [DLAB-823]: added placeholder to billing grid --- .../reporting-grid.component.html | 101 +++--------------- .../reporting-grid.component.scss | 37 +++++-- .../reporting-grid.component.ts | 20 ++-- 3 files changed, 51 insertions(+), 107 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html index 968d14884f..94723701b4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html @@ -17,81 +17,6 @@ ~ under the License. --> - - -
@@ -147,7 +72,8 @@ {{ element[DICTIONARY.billing.cost] }} {{ element[DICTIONARY.billing.currencyCode] }} @@ -205,20 +131,21 @@ + + + + - - + + - + + + +
- {{ reportData[DICTIONARY.billing.costTotal] }} {{ reportData[DICTIONARY.billing.currencyCode] }} + {{ reportData[DICTIONARY.billing.costTotal] }} + {{ reportData[DICTIONARY.billing.currencyCode] }} + To start working, please, create new environment +
- - \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss index 1c2ced0f74..5c565bb004 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss @@ -17,34 +17,40 @@ * under the License. */ - .table-wrapper { - width: 100%; - } +.table-wrapper { + width: 100%; +} .reporting { width: 100%; min-width: 1100px; overflow: auto; + tr { th { font-size: 11px; } + td { - font-size: 13px; + font-size: 13px; } + &.filter-row { th { padding: 5px; } + .filter-field { font-size: 13px; } } } + .th_shape { width: 10%; } + .th_user, .env_name, .service { @@ -52,43 +58,54 @@ overflow: hidden; word-wrap: break-word; } + .th_type { width: 8%; } + .th_status { width: 8%; } + .th_charges { width: 8%; } } + .dashboard_table_body { td:first-child { cursor: default; } - .dropdown-multiselect { - button { - font-size: 14px; - height: 34px; - padding: 7px 20px; + + .dropdown-multiselect { + button { + font-size: 14px; + height: 34px; + padding: 7px 20px; + } } - } } +.no-data {} + @media screen and (max-width: 1280px) { .dashboard_table.reporting { + .env_name, .service, .th_type, .th_rstatus { width: 10%; } + .th_user { width: 12%; } + .th_charges { width: 6%; } + .user-field { word-wrap: break-word; } diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts index b919c27751..9310c17058 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts @@ -25,7 +25,7 @@ import { DICTIONARY, ReportingConfigModel } from '../../../dictionary/global.dic selector: 'dlab-reporting-grid', templateUrl: './reporting-grid.component.html', styleUrls: ['./reporting-grid.component.scss', - '../../resources/resources-grid/resources-grid.component.css'] + '../../resources/resources-grid/resources-grid.component.css'] }) export class ReportingGridComponent implements OnInit { readonly DICTIONARY = DICTIONARY; @@ -41,15 +41,15 @@ export class ReportingGridComponent implements OnInit { displayedColumns: string[] = ['name', 'user', 'type', 'status', 'shape', 'service', 'charge']; displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions']; - public filteringColumns: Array = [ - { title: 'User', name: 'user', className: 'th_user', filtering: true, role: 'admin'}, - { title: 'Environment name', name: 'dlab_id', className: 'env_name', filtering: true }, - { title: 'Resource Type', name: 'resource_type', className: 'th_type', filtering: true }, - { title: 'Status', name: 'status', className: 'th_rstatus', filtering: true }, - { title: DICTIONARY.instance_size, name: DICTIONARY.billing.instance_size, className: 'th_shape', filtering: true }, - { title: DICTIONARY.service, name: DICTIONARY.billing.service_filter_key, className: 'service', filtering: true }, - { title: 'Service Charges', name: 'charges', className: 'th_charges', filtering: false } - ]; + // public filteringColumns: Array = [ + // { title: 'User', name: 'user', className: 'th_user', filtering: true, role: 'admin'}, + // { title: 'Environment name', name: 'dlab_id', className: 'env_name', filtering: true }, + // { title: 'Resource Type', name: 'resource_type', className: 'th_type', filtering: true }, + // { title: 'Status', name: 'status', className: 'th_rstatus', filtering: true }, + // { title: DICTIONARY.instance_size, name: DICTIONARY.billing.instance_size, className: 'th_shape', filtering: true }, + // { title: DICTIONARY.service, name: DICTIONARY.billing.service_filter_key, className: 'service', filtering: true }, + // { title: 'Service Charges', name: 'charges', className: 'th_charges', filtering: false } + // ]; ngOnInit() { } From a9601a63a84a9ec6b33b166e2866fc044db4b0ea Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 27 Jun 2019 12:46:30 +0300 Subject: [PATCH 228/357] [DLAB-823]: added placeholder to management grid --- .../management-grid/management-grid.component.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index da87ed3a41..ce66673251 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -112,9 +112,16 @@ + + + To start working, please, create new environment + + + +
From 258189519cc976abe9057a664d340b25cc6eb6a5 Mon Sep 17 00:00:00 2001 From: bhliva Date: Thu, 27 Jun 2019 12:36:39 +0300 Subject: [PATCH 229/357] DLAB-746 fixed bug connected with project resource creation --- .../dto/exploratory/ExploratoryBaseDTO.java | 2 +- .../dto/exploratory/ExploratoryCreateDTO.java | 17 +++++++++-------- .../service/impl/ExploratoryServiceImpl.java | 2 +- .../project-form/project-form.component.ts | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryBaseDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryBaseDTO.java index 1c68c758f2..6550320538 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryBaseDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryBaseDTO.java @@ -28,7 +28,7 @@ public class ExploratoryBaseDTO> extends Resourc private final T self = (T) this; @JsonProperty("notebook_image") private String notebookImage; - @JsonProperty("project") + @JsonProperty("project_name") private String project; public String getNotebookImage() { diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCreateDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCreateDTO.java index 0a4c407f8b..7f87951818 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCreateDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCreateDTO.java @@ -39,9 +39,7 @@ public class ExploratoryCreateDTO> extends Exp private List clusterConfig; @JsonProperty("tags") private Map tags; - @JsonProperty("project") - private String project; - @JsonProperty("endpoint") + @JsonProperty("endpoint_name") private String endpoint; /** @@ -84,11 +82,6 @@ public T withEndpoint(String endpoint) { return self; } - public T withProject(String project) { - this.project = project; - return self; - } - public String getImageName() { return imageName; } @@ -102,6 +95,14 @@ public T withClusterConfig(List config) { return self; } + public String getEndpoint() { + return endpoint; + } + + public void setEndpoint(String endpoint) { + this.endpoint = endpoint; + } + public List getClusterConfig() { return clusterConfig; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java index a043b5205e..9ce4a487ac 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java @@ -103,7 +103,7 @@ public String create(UserInfo userInfo, Exploratory exploratory, @Project String isAdded = true; final ExploratoryGitCredsDTO gitCreds = gitCredsDAO.findGitCreds(userInfo.getName()); log.debug("Created exploratory environment {} for user {}", exploratory.getName(), userInfo.getName()); - final String uuid = provisioningService.post(EXPLORATORY_CREATE, userInfo.getAccessToken(), + final String uuid = provisioningService.post(EXPLORATORY_CREATE, userInfo.getAccessToken(), requestBuilder.newExploratoryCreate(exploratory, userInfo, gitCreds, userInstanceDTO.getTags()), String.class); requestId.put(userInfo.getName(), uuid); diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 3c2627b4db..c3f7297eec 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -102,7 +102,7 @@ export class ProjectFormComponent implements OnInit { if ($event.target.files && $event.target.files.length) { const [file] = $event.target.files; - reader.readAsDataURL(file); + reader.readAsBinaryString(file); reader.onload = () => { this.projectForm.patchValue({ From 97b2b4f80e4a6d270edf762934045082dbcfd6f0 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Thu, 27 Jun 2019 14:58:19 +0300 Subject: [PATCH 230/357] aws - project tag added for bucket gcp - project creation, project_prepary.py created --- .../general/scripts/aws/project_prepare.py | 6 + .../general/scripts/gcp/project_prepare.py | 467 ++++++++++++++++++ .../src/general/scripts/gcp/ssn_configure.py | 2 +- 3 files changed, 474 insertions(+), 1 deletion(-) create mode 100644 infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py index 589d17c3bc..2e76c81b2c 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py @@ -483,6 +483,12 @@ params = "--bucket_name {} --infra_tag_name {} --infra_tag_value {} --region {} --bucket_name_tag {}" \ .format(project_conf['bucket_name'], project_conf['tag_name'], project_conf['bucket_name'], project_conf['region'], project_conf['bucket_name_tag']) + try: + os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + ';project_tag:{}'.format( + project_conf['project_tag']) + except KeyError: + os.environ['conf_additional_tags'] = 'project_tag:{}'.format(project_conf['project_tag']) + print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) try: local("~/scripts/{}.py {}".format('common_create_bucket', params)) except: diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py new file mode 100644 index 0000000000..eb60871a14 --- /dev/null +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py @@ -0,0 +1,467 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +import json +from dlab.fab import * +from dlab.meta_lib import * +import sys, time, os +from dlab.actions_lib import * +import traceback + + +if __name__ == "__main__": + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], + os.environ['request_id']) + local_log_filepath = "/logs/project/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + print('Generating infrastructure names and tags') + project_conf = dict() + project_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') + project_conf['key_name'] = os.environ['conf_key_name'] + project_conf['user_keyname'] = os.environ['project_name'] + project_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-') + try: + if os.environ['gcp_vpc_name'] == '': + raise KeyError + else: + project_conf['vpc_name'] = os.environ['gcp_vpc_name'] + except KeyError: + project_conf['vpc_name'] = project_conf['service_base_name'] + '-ssn-vpc' + project_conf['vpc_cidr'] = os.environ['conf_vpc_cidr'] + project_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(project_conf['service_base_name'], + project_conf['project_name']) + project_conf['subnet_name'] = os.environ['gcp_subnet_name'] + project_conf['region'] = os.environ['gcp_region'] + project_conf['zone'] = os.environ['gcp_zone'] + project_conf['vpc_selflink'] = GCPMeta().get_vpc(project_conf['vpc_name'])['selfLink'] + project_conf['private_subnet_prefix'] = os.environ['gcp_private_subnet_prefix'] + project_conf['edge_service_account_name'] = '{}-{}-edge'.format(project_conf['service_base_name'], + project_conf['project_name']) + project_conf['edge_role_name'] = '{}-{}-edge'.format(project_conf['service_base_name'], + project_conf['project_name']) + project_conf['ps_service_account_name'] = '{}-{}-ps'.format(project_conf['service_base_name'], + project_conf['project_name']) + project_conf['ps_role_name'] = '{}-{}-ps'.format(project_conf['service_base_name'], + project_conf['project_name']) + project_conf['ps_policy_path'] = '/root/files/ps_policy.json' + project_conf['ps_roles_path'] = '/root/files/ps_roles.json' + project_conf['instance_name'] = '{0}-{1}-edge'.format(project_conf['service_base_name'], edge_conf['project_name']) + project_conf['ssn_instance_name'] = '{}-ssn'.format(edge_conf['service_base_name']) + project_conf['bucket_name'] = '{0}-{1}-bucket'.format(project_conf['service_base_name'], edge_conf['project_name']) + project_conf['shared_bucket_name'] = '{}-shared-bucket'.format(project_conf['service_base_name']) + project_conf['instance_size'] = os.environ['gcp_edge_instance_size'] + project_conf['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) + project_conf['image_name'] = os.environ['gcp_{}_image_name'.format(os.environ['conf_os_family'])] + project_conf['static_address_name'] = '{0}-{1}-ip'.format(project_conf['service_base_name'], project_conf['project_name']) + project_conf['fw_edge_ingress_public'] = '{}-ingress-public'.format(project_conf['instance_name']) + project_conf['fw_edge_ingress_internal'] = '{}-ingress-internal'.format(project_conf['instance_name']) + project_conf['fw_edge_egress_public'] = '{}-egress-public'.format(project_conf['instance_name']) + project_conf['fw_edge_egress_internal'] = '{}-egress-internal'.format(project_conf['instance_name']) + project_conf['ps_firewall_target'] = '{0}-{1}-ps'.format(project_conf['service_base_name'], + project_conf['project_name']) + project_conf['fw_common_name'] = '{}-{}-ps'.format(project_conf['service_base_name'], project_conf['project_name']) + project_conf['fw_ps_ingress'] = '{}-ingress'.format(project_conf['fw_common_name']) + project_conf['fw_ps_egress_private'] = '{}-egress-private'.format(project_conf['fw_common_name']) + project_conf['fw_ps_egress_public'] = '{}-egress-public'.format(project_conf['fw_common_name']) + project_conf['network_tag'] = project_conf['instance_name'] + project_conf['instance_labels'] = {"name": project_conf['instance_name'], + "sbn": project_conf['service_base_name'], + "user": project_conf['project_name'], + "product": "dlab"} + project_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr'] + + # FUSE in case of absence of user's key + fname = "/root/keys/{}.pub".format(project_conf['user_keyname']) + if not os.path.isfile(fname): + print("USERs PUBLIC KEY DOES NOT EXIST in {}".format(fname)) + sys.exit(1) + + print("Will create exploratory environment with edge node as access point as following: ".format(json.dumps( + edge_conf, sort_keys=True, indent=4, separators=(',', ': ')))) + logging.info(json.dumps(edge_conf)) + + try: + logging.info('[CREATE SUBNET]') + print('[CREATE SUBNET]') + params = "--subnet_name {} --region {} --vpc_selflink {} --prefix {} --vpc_cidr {}" \ + .format(edge_conf['private_subnet_name'], edge_conf['region'], edge_conf['vpc_selflink'], + edge_conf['private_subnet_prefix'], edge_conf['vpc_cidr']) + try: + local("~/scripts/{}.py {}".format('common_create_subnet', params)) + edge_conf['private_subnet_cidr'] = GCPMeta().get_subnet(edge_conf['private_subnet_name'], + edge_conf['region'])['ipCidrRange'] + except: + traceback.print_exc() + raise Exception + except Exception as err: + print('Error: {0}'.format(err)) + try: + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + except: + print("Subnet hasn't been created.") + append_result("Failed to create subnet.", str(err)) + sys.exit(1) + + print('NEW SUBNET CIDR CREATED: {}'.format(edge_conf['private_subnet_cidr'])) + + try: + logging.info('[CREATE SERVICE ACCOUNT AND ROLE FOR EDGE NODE]') + print('[CREATE SERVICE ACCOUNT AND ROLE FOR EDGE NODE]') + params = "--service_account_name {} --role_name {}".format(edge_conf['edge_service_account_name'], + edge_conf['edge_role_name']) + + try: + local("~/scripts/{}.py {}".format('common_create_service_account', params)) + except: + traceback.print_exc() + raise Exception + except Exception as err: + print('Error: {0}'.format(err)) + try: + GCPActions().remove_service_account(edge_conf['edge_service_account_name']) + GCPActions().remove_role(edge_conf['edge_role_name']) + except: + print("Service account or role hasn't been created") + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + append_result("Failed to creating service account and role.", str(err)) + sys.exit(1) + + try: + logging.info('[CREATE SERVICE ACCOUNT AND ROLE FOR PRIVATE SUBNET]') + print('[CREATE SERVICE ACCOUNT AND ROLE FOR NOTEBOOK NODE]') + params = "--service_account_name {} --role_name {} --policy_path {} --roles_path {}".format( + edge_conf['ps_service_account_name'], edge_conf['ps_role_name'], + edge_conf['ps_policy_path'], edge_conf['ps_roles_path']) + + try: + local("~/scripts/{}.py {}".format('common_create_service_account', params)) + except: + traceback.print_exc() + raise Exception + except Exception as err: + print('Error: {0}'.format(err)) + try: + GCPActions().remove_service_account(edge_conf['ps_service_account_name']) + GCPActions().remove_role(edge_conf['ps_role_name']) + except: + print("Service account or role hasn't been created") + GCPActions().remove_service_account(edge_conf['edge_service_account_name']) + GCPActions().remove_role(edge_conf['edge_role_name']) + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + append_result("Failed to creating service account and role.", str(err)) + sys.exit(1) + + try: + pre_defined_firewall = True + logging.info('[CREATE FIREWALL FOR EDGE NODE]') + print('[CREATE FIREWALL FOR EDGE NODE]') + firewall_rules = dict() + firewall_rules['ingress'] = [] + firewall_rules['egress'] = [] + + ingress_rule = dict() + ingress_rule['name'] = edge_conf['fw_edge_ingress_public'] + ingress_rule['targetTags'] = [edge_conf['network_tag']] + ingress_rule['sourceRanges'] = [edge_conf['allowed_ip_cidr']] + rules = [ + { + 'IPProtocol': 'tcp', + 'ports': ['22', '80', '3128'] + } + ] + ingress_rule['allowed'] = rules + ingress_rule['network'] = edge_conf['vpc_selflink'] + ingress_rule['direction'] = 'INGRESS' + firewall_rules['ingress'].append(ingress_rule) + + ingress_rule = dict() + ingress_rule['name'] = edge_conf['fw_edge_ingress_internal'] + ingress_rule['targetTags'] = [edge_conf['network_tag']] + ingress_rule['sourceRanges'] = [edge_conf['private_subnet_cidr']] + rules = [ + { + 'IPProtocol': 'all' + } + ] + ingress_rule['allowed'] = rules + ingress_rule['network'] = edge_conf['vpc_selflink'] + ingress_rule['direction'] = 'INGRESS' + firewall_rules['ingress'].append(ingress_rule) + + egress_rule = dict() + egress_rule['name'] = edge_conf['fw_edge_egress_public'] + egress_rule['targetTags'] = [edge_conf['network_tag']] + egress_rule['destinationRanges'] = [edge_conf['allowed_ip_cidr']] + rules = [ + { + 'IPProtocol': 'udp', + 'ports': ['53', '123'] + }, + { + 'IPProtocol': 'tcp', + 'ports': ['80', '443'] + } + ] + egress_rule['allowed'] = rules + egress_rule['network'] = edge_conf['vpc_selflink'] + egress_rule['direction'] = 'EGRESS' + firewall_rules['egress'].append(egress_rule) + + egress_rule = dict() + egress_rule['name'] = edge_conf['fw_edge_egress_internal'] + egress_rule['targetTags'] = [edge_conf['network_tag']] + egress_rule['destinationRanges'] = [edge_conf['private_subnet_cidr']] + rules = [ + { + 'IPProtocol': 'tcp', + 'ports': ['22', '389', '8888', '8080', '8787', '6006', '20888', '8042', '8088', '18080', '50070', + '8085', '8081', '4040-4045'] + } + ] + egress_rule['allowed'] = rules + egress_rule['network'] = edge_conf['vpc_selflink'] + egress_rule['direction'] = 'EGRESS' + firewall_rules['egress'].append(egress_rule) + + params = "--firewall '{}'".format(json.dumps(firewall_rules)) + try: + local("~/scripts/{}.py {}".format('common_create_firewall', params)) + except: + traceback.print_exc() + raise Exception + except Exception as err: + print('Error: {0}'.format(err)) + GCPActions().remove_service_account(edge_conf['ps_service_account_name']) + GCPActions().remove_role(edge_conf['ps_role_name']) + GCPActions().remove_service_account(edge_conf['edge_service_account_name']) + GCPActions().remove_role(edge_conf['edge_role_name']) + append_result("Failed to create firewall for Edge node.", str(err)) + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + sys.exit(1) + + try: + logging.info('[CREATE FIREWALL FOR PRIVATE SUBNET]') + print('[CREATE FIREWALL FOR PRIVATE SUBNET]') + firewall_rules = dict() + firewall_rules['ingress'] = [] + firewall_rules['egress'] = [] + + ingress_rule = dict() + ingress_rule['name'] = edge_conf['fw_ps_ingress'] + ingress_rule['targetTags'] = [ + edge_conf['ps_firewall_target'] + ] + ingress_rule['sourceRanges'] = [edge_conf['private_subnet_cidr'], + GCPMeta().get_subnet(edge_conf['subnet_name'], + edge_conf['region'])['ipCidrRange'] + ] + rules = [ + { + 'IPProtocol': 'all' + } + ] + ingress_rule['allowed'] = rules + ingress_rule['network'] = edge_conf['vpc_selflink'] + ingress_rule['direction'] = 'INGRESS' + firewall_rules['ingress'].append(ingress_rule) + + egress_rule = dict() + egress_rule['name'] = edge_conf['fw_ps_egress_private'] + egress_rule['targetTags'] = [ + edge_conf['ps_firewall_target'] + ] + egress_rule['destinationRanges'] = [edge_conf['private_subnet_cidr'], + GCPMeta().get_subnet(edge_conf['subnet_name'], + edge_conf['region'])['ipCidrRange'] + ] + rules = [ + { + 'IPProtocol': 'all' + } + ] + egress_rule['allowed'] = rules + egress_rule['network'] = edge_conf['vpc_selflink'] + egress_rule['direction'] = 'EGRESS' + firewall_rules['egress'].append(egress_rule) + + egress_rule = dict() + egress_rule['name'] = edge_conf['fw_ps_egress_public'] + egress_rule['targetTags'] = [ + edge_conf['ps_firewall_target'] + ] + egress_rule['destinationRanges'] = [edge_conf['allowed_ip_cidr']] + rules = [ + { + 'IPProtocol': 'tcp', + 'ports': ['443'] + } + ] + egress_rule['allowed'] = rules + egress_rule['network'] = edge_conf['vpc_selflink'] + egress_rule['direction'] = 'EGRESS' + firewall_rules['egress'].append(egress_rule) + + params = "--firewall '{}'".format(json.dumps(firewall_rules)) + try: + local("~/scripts/{}.py {}".format('common_create_firewall', params)) + except: + traceback.print_exc() + raise Exception + except Exception as err: + print('Error: {0}'.format(err)) + append_result("Failed to create firewall for private subnet.", str(err)) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) + GCPActions().remove_service_account(edge_conf['ps_service_account_name']) + GCPActions().remove_role(edge_conf['ps_role_name']) + GCPActions().remove_service_account(edge_conf['edge_service_account_name']) + GCPActions().remove_role(edge_conf['edge_role_name']) + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + sys.exit(1) + + try: + logging.info('[CREATE BUCKETS]') + print('[CREATE BUCKETS]') + params = "--bucket_name {}".format(edge_conf['bucket_name']) + + try: + local("~/scripts/{}.py {}".format('common_create_bucket', params)) + except: + traceback.print_exc() + raise Exception + except Exception as err: + print('Error: {0}'.format(err)) + append_result("Unable to create bucket.", str(err)) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) + GCPActions().remove_firewall(edge_conf['fw_ps_ingress']) + GCPActions().remove_firewall(edge_conf['fw_ps_egress_private']) + GCPActions().remove_firewall(edge_conf['fw_ps_egress_public']) + GCPActions().remove_service_account(edge_conf['ps_service_account_name']) + GCPActions().remove_role(edge_conf['ps_role_name']) + GCPActions().remove_service_account(edge_conf['edge_service_account_name']) + GCPActions().remove_role(edge_conf['edge_role_name']) + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + sys.exit(1) + + try: + logging.info('[SET PERMISSIONS FOR USER AND SHARED BUCKETS]') + print('[SET PERMISSIONS FOR USER AND SHARED BUCKETS]') + GCPActions().set_bucket_owner(edge_conf['bucket_name'], edge_conf['ps_service_account_name']) + GCPActions().set_bucket_owner(edge_conf['shared_bucket_name'], edge_conf['ps_service_account_name']) + except Exception as err: + print('Error: {0}'.format(err)) + append_result("Failed to set bucket permissions.", str(err)) + GCPActions().remove_bucket(edge_conf['bucket_name']) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) + GCPActions().remove_firewall(edge_conf['fw_ps_ingress']) + GCPActions().remove_firewall(edge_conf['fw_ps_egress_private']) + GCPActions().remove_firewall(edge_conf['fw_ps_egress_public']) + GCPActions().remove_service_account(edge_conf['ps_service_account_name']) + GCPActions().remove_role(edge_conf['ps_role_name']) + GCPActions().remove_service_account(edge_conf['edge_service_account_name']) + GCPActions().remove_role(edge_conf['edge_role_name']) + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + sys.exit(1) + + try: + logging.info('[CREATING STATIC IP ADDRESS]') + print('[CREATING STATIC IP ADDRESS]') + params = "--address_name {} --region {}".format(edge_conf['static_address_name'], edge_conf['region']) + try: + local("~/scripts/{}.py {}".format('edge_create_static_ip', params)) + except: + traceback.print_exc() + raise Exception + except Exception as err: + print('Error: {0}'.format(err)) + append_result("Failed to create static ip.", str(err)) + try: + GCPActions().remove_static_address(edge_conf['static_address_name'], edge_conf['region']) + except: + print("Static IP address hasn't been created.") + GCPActions().remove_bucket(edge_conf['bucket_name']) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) + GCPActions().remove_firewall(edge_conf['fw_ps_ingress']) + GCPActions().remove_firewall(edge_conf['fw_ps_egress_private']) + GCPActions().remove_firewall(edge_conf['fw_ps_egress_public']) + GCPActions().remove_service_account(edge_conf['ps_service_account_name']) + GCPActions().remove_role(edge_conf['ps_role_name']) + GCPActions().remove_service_account(edge_conf['edge_service_account_name']) + GCPActions().remove_role(edge_conf['edge_role_name']) + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + sys.exit(1) + + if os.environ['conf_os_family'] == 'debian': + initial_user = 'ubuntu' + sudo_group = 'sudo' + if os.environ['conf_os_family'] == 'redhat': + initial_user = 'ec2-user' + sudo_group = 'wheel' + + try: + edge_conf['static_ip'] = \ + GCPMeta().get_static_address(edge_conf['region'], edge_conf['static_address_name'])['address'] + logging.info('[CREATE EDGE INSTANCE]') + print('[CREATE EDGE INSTANCE]') + params = "--instance_name {} --region {} --zone {} --vpc_name {} --subnet_name {} --instance_size {} --ssh_key_path {} --initial_user {} --service_account_name {} --image_name {} --instance_class {} --static_ip {} --network_tag {} --labels '{}'".\ + format(edge_conf['instance_name'], edge_conf['region'], edge_conf['zone'], edge_conf['vpc_name'], + edge_conf['subnet_name'], edge_conf['instance_size'], edge_conf['ssh_key_path'], initial_user, + edge_conf['edge_service_account_name'], edge_conf['image_name'], 'edge', edge_conf['static_ip'], + edge_conf['network_tag'], json.dumps(edge_conf['instance_labels'])) + try: + local("~/scripts/{}.py {}".format('common_create_instance', params)) + except: + traceback.print_exc() + raise Exception + except Exception as err: + print('Error: {0}'.format(err)) + append_result("Failed to create instance.", str(err)) + GCPActions().remove_static_address(edge_conf['static_address_name'], edge_conf['region']) + GCPActions().remove_bucket(edge_conf['bucket_name']) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) + GCPActions().remove_firewall(edge_conf['fw_ps_ingress']) + GCPActions().remove_firewall(edge_conf['fw_ps_egress_private']) + GCPActions().remove_firewall(edge_conf['fw_ps_egress_public']) + GCPActions().remove_service_account(edge_conf['ps_service_account_name']) + GCPActions().remove_role(edge_conf['ps_role_name']) + GCPActions().remove_service_account(edge_conf['edge_service_account_name']) + GCPActions().remove_role(edge_conf['edge_role_name']) + GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + sys.exit(1) \ No newline at end of file diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py index fe8235fde4..a7aa2f983e 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py @@ -215,7 +215,7 @@ logging.info('[CONFIGURING DOCKER AT SSN INSTANCE]') print('[CONFIGURING DOCKER AT SSN INSTANCE]') additional_config = [{"name": "base", "tag": "latest"}, - {"name": "edge", "tag": "latest"}, + {"name": "project", "tag": "latest"}, {"name": "jupyter", "tag": "latest"}, {"name": "rstudio", "tag": "latest"}, {"name": "zeppelin", "tag": "latest"}, From 4a1ec0532634be0721d5c75a3fffa20f851d542b Mon Sep 17 00:00:00 2001 From: bhliva Date: Thu, 27 Jun 2019 15:22:03 +0300 Subject: [PATCH 231/357] DLAB-000 made get endpoint API case insensitive --- .../java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java index a614773c29..413d06dd1c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EndpointDAOImpl.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Optional; -import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Filters.regex; public class EndpointDAOImpl extends BaseDAO implements EndpointDAO { @@ -33,6 +33,6 @@ public void remove(String name) { } private Bson endpointCondition(String name) { - return eq("name", name); + return regex("name", "^" + name, "i"); } } From 1a0c0d71b3ee8137d12d7e732726a43a81f8896a Mon Sep 17 00:00:00 2001 From: bhliva Date: Thu, 27 Jun 2019 16:06:16 +0300 Subject: [PATCH 232/357] DLAB-000 fixed project key regex --- .../main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 4d836cc932..8490bd3911 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -17,7 +17,7 @@ public class ProjectDTO { @NotNull private final Set groups; @NotNull - @Pattern(regexp = "^ssh-", message = "Wrong key format. Key should be in openSSH format") + @Pattern(regexp = "^ssh-.*", message = "Wrong key format. Key should be in openSSH format") private final String key; @NotNull private final String tag; From c5cf2c2e4dbae7a6ea3855081ba9cb91fd793542 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 1 Jul 2019 13:28:52 +0300 Subject: [PATCH 233/357] [DLAB-823]: added placeholder to management grid --- .../resources/webapp/src/app/login/login.component.ts | 10 +++++----- .../webapp/src/app/shared/navbar/navbar.component.html | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts b/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts index b456bf1ca0..489acae62f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts @@ -50,11 +50,11 @@ export class LoginComponent implements OnInit, OnDestroy { } ngOnInit() { - this.applicationSecurityService.isLoggedIn().subscribe(result => { - console.log('LOGGED IN /login component'); + // this.applicationSecurityService.isLoggedIn().subscribe(result => { + // console.log('LOGGED IN /login component'); - result && this.checkHealthStatusAndRedirect(result); - }); + // result && this.checkHealthStatusAndRedirect(result); + // }); } ngOnDestroy() { @@ -69,7 +69,7 @@ export class LoginComponent implements OnInit, OnDestroy { .login(this.model) .subscribe((result) => { if (result) { - this.checkHealthStatusAndRedirect(result); + this.appRoutingService.redirectToHomePage(); return true; } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 10abf9c49f..c5a424f687 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -32,9 +32,9 @@
- + info From bca152aac4c96874833b4ff649ef20c4e36eaa17 Mon Sep 17 00:00:00 2001 From: bhliva Date: Mon, 1 Jul 2019 13:49:13 +0300 Subject: [PATCH 234/357] DLAB-830 added project statuses and possibility to terminate project --- ...eProjectResult.java => ProjectResult.java} | 2 +- .../dto/{ => project}/ProjectCreateDTO.java | 3 ++- .../dlab/dto/project/ProjectTerminateDTO.java | 13 ++++++++++ .../handlers/ProjectCallbackHandler.java | 12 +++++---- .../backendapi/resources/ProjectResource.java | 12 ++++++++- .../backendapi/service/ProjectService.java | 4 ++- .../service/impl/ProjectServiceImpl.java | 22 ++++++++++++---- .../mock_response/gcp/project_terminate.json | 12 +++++++++ .../epam/dlab/backendapi/dao/ProjectDAO.java | 2 +- .../dlab/backendapi/dao/ProjectDAOImpl.java | 9 +++---- .../dlab/backendapi/domain/ProjectDTO.java | 12 +++++++-- .../backendapi/resources/ProjectResource.java | 6 ++--- .../resources/callback/ProjectCallback.java | 14 +++++------ .../backendapi/service/ProjectService.java | 3 ++- .../service/impl/ProjectServiceImpl.java | 25 +++++++++++++++---- 15 files changed, 112 insertions(+), 39 deletions(-) rename services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/{CreateProjectResult.java => ProjectResult.java} (82%) rename services/dlab-model/src/main/java/com/epam/dlab/dto/{ => project}/ProjectCreateDTO.java (81%) create mode 100644 services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java create mode 100644 services/provisioning-service/src/main/resources/mock_response/gcp/project_terminate.json diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectResult.java similarity index 82% rename from services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java rename to services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectResult.java index 3059b0ef45..c1e68273b2 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectResult.java @@ -7,7 +7,7 @@ @Data @JsonIgnoreProperties(ignoreUnknown = true) -public class CreateProjectResult extends StatusBaseDTO { +public class ProjectResult extends StatusBaseDTO { private ProjectEdgeInfo edgeInfo; @JsonProperty("project_name") private String projectName; diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java similarity index 81% rename from services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java rename to services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java index a5ec69345b..a933f0b5f0 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java @@ -1,5 +1,6 @@ -package com.epam.dlab.dto; +package com.epam.dlab.dto.project; +import com.epam.dlab.dto.ResourceBaseDTO; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; import lombok.Data; diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java new file mode 100644 index 0000000000..533e342d9b --- /dev/null +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java @@ -0,0 +1,13 @@ +package com.epam.dlab.dto.project; + +import com.epam.dlab.dto.ResourceBaseDTO; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class ProjectTerminateDTO extends ResourceBaseDTO { + @JsonProperty("project_name") + private final String name; +} diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java index 6f7f9eb3c5..71a21e1f1e 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java @@ -3,23 +3,25 @@ import com.epam.dlab.auth.SystemUserInfoService; import com.epam.dlab.backendapi.core.commands.DockerAction; import com.epam.dlab.dto.UserInstanceStatus; -import com.epam.dlab.dto.base.project.CreateProjectResult; import com.epam.dlab.dto.base.project.ProjectEdgeInfo; +import com.epam.dlab.dto.base.project.ProjectResult; import com.epam.dlab.exceptions.DlabException; import com.epam.dlab.rest.client.RESTService; import com.fasterxml.jackson.databind.JsonNode; import java.io.IOException; -public class ProjectCallbackHandler extends ResourceCallbackHandler { +public class ProjectCallbackHandler extends ResourceCallbackHandler { private final String callbackUri; + private final String projectName; public ProjectCallbackHandler(SystemUserInfoService systemUserInfoService, RESTService selfService, String user, - String uuid, DockerAction action, String callbackUri) { + String uuid, DockerAction action, String callbackUri, String projectName) { super(systemUserInfoService, selfService, user, uuid, action); this.callbackUri = callbackUri; + this.projectName = projectName; } @Override @@ -28,13 +30,13 @@ protected String getCallbackURI() { } @Override - protected CreateProjectResult parseOutResponse(JsonNode resultNode, CreateProjectResult baseStatus) { + protected ProjectResult parseOutResponse(JsonNode resultNode, ProjectResult baseStatus) { + baseStatus.setProjectName(projectName); if (resultNode != null && getAction() == DockerAction.CREATE && UserInstanceStatus.of(baseStatus.getStatus()) != UserInstanceStatus.FAILED) { try { final ProjectEdgeInfo projectEdgeInfo = mapper.readValue(resultNode.toString(), ProjectEdgeInfo.class); baseStatus.setEdgeInfo(projectEdgeInfo); - baseStatus.setProjectName(resultNode.get("project_name").asText()); } catch (IOException e) { throw new DlabException("Cannot parse the EDGE info in JSON: " + e.getLocalizedMessage(), e); } diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java index 6bb8826ddd..fa7aee13e5 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -2,7 +2,8 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.service.ProjectService; -import com.epam.dlab.dto.ProjectCreateDTO; +import com.epam.dlab.dto.project.ProjectCreateDTO; +import com.epam.dlab.dto.project.ProjectTerminateDTO; import com.google.inject.Inject; import io.dropwizard.auth.Auth; @@ -22,10 +23,19 @@ public ProjectResource(ProjectService projectService) { this.projectService = projectService; } + @Path("/create") @POST @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public Response createProject(@Auth UserInfo userInfo, ProjectCreateDTO dto) { return Response.ok(projectService.create(userInfo, dto)).build(); } + + @Path("/terminate") + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public Response terminateProject(@Auth UserInfo userInfo, ProjectTerminateDTO dto) { + return Response.ok(projectService.terminate(userInfo, dto)).build(); + } } diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index 60656f4919..b18aa8c83a 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -1,9 +1,11 @@ package com.epam.dlab.backendapi.service; import com.epam.dlab.auth.UserInfo; -import com.epam.dlab.dto.ProjectCreateDTO; +import com.epam.dlab.dto.project.ProjectCreateDTO; +import com.epam.dlab.dto.project.ProjectTerminateDTO; public interface ProjectService { String create(UserInfo userInfo, ProjectCreateDTO projectCreateDTO); + String terminate(UserInfo userInfo, ProjectTerminateDTO dto); } diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index dc6401aaa8..4eebcfc30d 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -7,7 +7,9 @@ import com.epam.dlab.backendapi.core.response.folderlistener.FolderListenerExecutor; import com.epam.dlab.backendapi.core.response.handlers.ProjectCallbackHandler; import com.epam.dlab.backendapi.service.ProjectService; -import com.epam.dlab.dto.ProjectCreateDTO; +import com.epam.dlab.dto.ResourceBaseDTO; +import com.epam.dlab.dto.project.ProjectCreateDTO; +import com.epam.dlab.dto.project.ProjectTerminateDTO; import com.epam.dlab.rest.client.RESTService; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.inject.Inject; @@ -15,6 +17,7 @@ @Slf4j public class ProjectServiceImpl implements ProjectService { + private static final String PROJECT_IMAGE = "docker.dlab-project"; @Inject protected RESTService selfService; @Inject @@ -30,24 +33,33 @@ public class ProjectServiceImpl implements ProjectService { @Override public String create(UserInfo userInfo, ProjectCreateDTO dto) { + return executeDocker(userInfo, dto, DockerAction.CREATE, dto.getName()); + } + + @Override + public String terminate(UserInfo userInfo, ProjectTerminateDTO dto) { + return executeDocker(userInfo, dto, DockerAction.TERMINATE, dto.getName()); + } + + private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerAction action, String projectName) { String uuid = DockerCommands.generateUUID(); folderListenerExecutor.start(configuration.getKeyLoaderDirectory(), configuration.getKeyLoaderPollTimeout(), new ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getName(), uuid, - DockerAction.CREATE, "/api/project/status")); + action, "/api/project/status", projectName)); RunDockerCommand runDockerCommand = new RunDockerCommand() .withInteractive() - .withName(String.join("_", dto.getName(), "project")) + .withName(String.join("_", projectName, "project")) .withVolumeForRootKeys(configuration.getKeyDirectory()) .withVolumeForResponse(configuration.getKeyLoaderDirectory()) .withVolumeForLog(configuration.getDockerLogDirectory(), "project") .withResource("project") .withRequestId(uuid) .withConfKeyName(configuration.getAdminKey()) - .withImage("docker.dlab-project") - .withAction(DockerAction.CREATE); + .withImage(PROJECT_IMAGE) + .withAction(action); try { commandExecutor.executeAsync(userInfo.getName(), uuid, commandBuilder.buildCommand(runDockerCommand, dto)); diff --git a/services/provisioning-service/src/main/resources/mock_response/gcp/project_terminate.json b/services/provisioning-service/src/main/resources/mock_response/gcp/project_terminate.json new file mode 100644 index 0000000000..7420dedc08 --- /dev/null +++ b/services/provisioning-service/src/main/resources/mock_response/gcp/project_terminate.json @@ -0,0 +1,12 @@ +{ + "status": "ok", + "response": { + "result": { + "Action": "Terminate edge node", + "project_tag": "prj1", + "service_base_name": "${CONF_SERVICE_BASE_NAME}" + }, + "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log" + }, + "request_id": "${REQUEST_ID}" +} \ No newline at end of file diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index 2e2ab55b67..0532f17884 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -11,7 +11,7 @@ public interface ProjectDAO { List getProjects(); - List getUserProjects(UserInfo userInfo); + List getUserProjectsWithStatus(UserInfo userInfo, ProjectDTO.Status status); void create(ProjectDTO projectDTO); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index dd89e5d1b2..484438df82 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -15,8 +15,7 @@ import java.util.Optional; import java.util.Set; -import static com.mongodb.client.model.Filters.eq; -import static com.mongodb.client.model.Filters.in; +import static com.mongodb.client.model.Filters.*; public class ProjectDAOImpl extends BaseDAO implements ProjectDAO { @@ -39,9 +38,9 @@ public List getProjects() { } @Override - public List getUserProjects(UserInfo userInfo) { - return find(PROJECTS_COLLECTION, in(GROUPS, Sets.union(userGroupDao.getUserGroups(userInfo.getName()), - userInfo.getRoles())), ProjectDTO.class); + public List getUserProjectsWithStatus(UserInfo userInfo, ProjectDTO.Status status) { + return find(PROJECTS_COLLECTION, and(in(GROUPS, Sets.union(userGroupDao.getUserGroups(userInfo.getName()), + userInfo.getRoles())), eq(STATUS_FIELD, status.toString())), ProjectDTO.class); } @Override diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 8490bd3911..2305774b26 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -1,5 +1,6 @@ package com.epam.dlab.backendapi.domain; +import com.epam.dlab.dto.UserInstanceStatus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; @@ -27,7 +28,14 @@ public class ProjectDTO { public enum Status { CREATING, - CREATED, - FAILED + ACTIVE, + FAILED, TERMINATED, TERMINATING; + + public static Status from(UserInstanceStatus userInstanceStatus) { + if (userInstanceStatus == UserInstanceStatus.RUNNING) { + return ACTIVE; + } + return Status.valueOf(userInstanceStatus.name()); + } } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java index e8414a4def..3a2b3fff9a 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -107,9 +107,7 @@ public Response getProjects(@Parameter(hidden = true) @Auth UserInfo userInfo, @Path("/me") @GET @Produces(MediaType.APPLICATION_JSON) - public Response getUserProjects(@Parameter(hidden = true) @Auth UserInfo userInfo, - @Parameter(description = "Project name") - @PathParam("name") String name) { + public Response getUserProjects(@Parameter(hidden = true) @Auth UserInfo userInfo) { return Response .ok(projectService.getUserProjects(userInfo)) .build(); @@ -144,7 +142,7 @@ public Response removeProject( @Parameter(hidden = true) @Auth UserInfo userInfo, @Parameter(description = "Project name") @PathParam("name") String name) { - projectService.remove(name); + projectService.terminate(userInfo, name); return Response.ok().build(); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java index 9807119585..a1b0039c7d 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java @@ -5,7 +5,7 @@ import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.domain.RequestId; import com.epam.dlab.dto.UserInstanceStatus; -import com.epam.dlab.dto.base.project.CreateProjectResult; +import com.epam.dlab.dto.base.project.ProjectResult; import com.google.inject.Inject; import io.dropwizard.auth.Auth; import lombok.extern.slf4j.Slf4j; @@ -13,7 +13,6 @@ import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -33,13 +32,14 @@ public ProjectCallback(ProjectDAO projectDAO, RequestId requestId) { @POST - public Response updateProjectStatus(@Auth UserInfo userInfo, CreateProjectResult projectResult) { + public Response updateProjectStatus(@Auth UserInfo userInfo, ProjectResult projectResult) { requestId.checkAndRemove(projectResult.getRequestId()); - if (UserInstanceStatus.of(projectResult.getStatus()) == UserInstanceStatus.FAILED) { - projectDAO.updateStatus(projectResult.getProjectName(), ProjectDTO.Status.FAILED); + final String projectName = projectResult.getProjectName(); + final UserInstanceStatus status = UserInstanceStatus.of(projectResult.getStatus()); + if (UserInstanceStatus.CREATED == status) { + projectDAO.updateEdgeInfoAndStatus(projectName, projectResult.getEdgeInfo(), ProjectDTO.Status.ACTIVE); } else { - projectDAO.updateEdgeInfoAndStatus(projectResult.getProjectName(), projectResult.getEdgeInfo(), - ProjectDTO.Status.CREATED); + projectDAO.updateStatus(projectName, ProjectDTO.Status.from(status)); } return Response.ok().build(); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index 3245144018..4c15d59110 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -7,13 +7,14 @@ public interface ProjectService { List getProjects(); + List getUserProjects(UserInfo userInfo); void create(UserInfo userInfo, ProjectDTO projectDTO); ProjectDTO get(String name); - void remove(String name); + void terminate(UserInfo userInfo, String name); void update(ProjectDTO projectDTO); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 637bdd3341..89709398e6 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -8,7 +8,8 @@ import com.epam.dlab.backendapi.service.EnvironmentService; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.constants.ServiceConsts; -import com.epam.dlab.dto.ProjectCreateDTO; +import com.epam.dlab.dto.project.ProjectCreateDTO; +import com.epam.dlab.dto.project.ProjectTerminateDTO; import com.epam.dlab.exceptions.ResourceConflictException; import com.epam.dlab.exceptions.ResourceNotFoundException; import com.epam.dlab.rest.client.RESTService; @@ -26,7 +27,8 @@ @Slf4j public class ProjectServiceImpl implements ProjectService { - private static final String CREATE_PRJ_API = "infrastructure/project"; + private static final String CREATE_PRJ_API = "infrastructure/project/create"; + private static final String TERMINATE_PRJ_API = "infrastructure/project/terminate"; private final ProjectDAO projectDAO; private final EnvironmentService environmentService; private final UserGroupDao userGroupDao; @@ -52,7 +54,7 @@ public List getProjects() { @Override public List getUserProjects(UserInfo userInfo) { - return projectDAO.getUserProjects(userInfo); + return projectDAO.getUserProjectsWithStatus(userInfo, ProjectDTO.Status.ACTIVE); } @Override @@ -72,9 +74,10 @@ public ProjectDTO get(String name) { } @Override - public void remove(String name) { + public void terminate(UserInfo userInfo, String name) { + terminateProjectOnCloud(userInfo, name); environmentService.terminateProjectEnvironment(name); - projectDAO.remove(name); + projectDAO.updateStatus(name, ProjectDTO.Status.TERMINATING); } @Override @@ -112,6 +115,18 @@ private void createProjectOnCloud(UserInfo user, ProjectDTO projectDTO) { } } + + private void terminateProjectOnCloud(UserInfo user, String projectName) { + try { + String uuid = provisioningService.post(TERMINATE_PRJ_API, user.getAccessToken(), + new ProjectTerminateDTO(projectName), String.class); + requestId.put(user.getName(), uuid); + } catch (Exception e) { + log.error("Can not terminate project due to: {}", e.getMessage()); + projectDAO.updateStatus(projectName, ProjectDTO.Status.FAILED); + } + } + private Supplier projectNotFound() { return () -> new ResourceNotFoundException("Project with passed name not found"); } From 2ce490e1a0062fe83c5879c2e88a662a50a33cec Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 1 Jul 2019 15:01:44 +0300 Subject: [PATCH 235/357] aws - notebook creation nginx error fixed --- .../src/general/lib/os/debian/edge_lib.py | 2 +- .../src/general/lib/os/redhat/edge_lib.py | 2 +- .../scripts/configure_nginx_reverse_proxy.py | 18 ++++++++--------- .../src/project/templates/nginx.conf | 20 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py index 2a51b1b772..89e8913202 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py @@ -91,7 +91,7 @@ def install_nginx_ldap(edge_ip, nginx_version, ldap_ip, ldap_dn, ldap_ou, ldap_s sudo('sed -i \'s/LDAP_OU/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_ou)) sudo('sed -i \'s/LDAP_SERVICE_PASSWORD/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_service_pass)) sudo('sed -i \'s/LDAP_SERVICE_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_service_username)) - sudo('sed -i \'s/LDAP_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_user)) +# sudo('sed -i \'s/LDAP_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_user)) sudo('sed -i \'s/EDGE_IP/{}/g\' /opt/dlab/templates/conf.d/proxy.conf'.format(edge_ip)) sudo('cp /opt/dlab/templates/nginx.conf /etc/nginx/') sudo('mkdir /etc/nginx/conf.d') diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py index 8f57e9c676..c9077554e4 100644 --- a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py @@ -97,7 +97,7 @@ def install_nginx_ldap(edge_ip, nginx_version, ldap_ip, ldap_dn, ldap_ou, ldap_s sudo('sed -i \'s/LDAP_OU/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_ou)) sudo('sed -i \'s/LDAP_SERVICE_PASSWORD/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_service_pass)) sudo('sed -i \'s/LDAP_SERVICE_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_service_username)) - sudo('sed -i \'s/LDAP_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_user)) +# sudo('sed -i \'s/LDAP_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_user)) sudo('sed -i \'s/EDGE_IP/{}/g\' /opt/dlab/templates/conf.d/proxy.conf'.format(edge_ip)) sudo('cp /opt/dlab/templates/nginx.conf /etc/nginx/') sudo('mkdir /etc/nginx/conf.d') diff --git a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py index 6b2ee34794..a85eb36cbc 100644 --- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py +++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py @@ -52,13 +52,13 @@ print("Failed establish connection. Excpeption: " + 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'], os.environ['{}_iam_user'.format( -# os.environ['conf_cloud_provider'])]) -# except Exception as err: -# print("Failed install nginx reverse proxy: " + 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'], os.environ['{}_iam_user'.format( + os.environ['conf_cloud_provider'])]) + except Exception as err: + print("Failed install nginx reverse proxy: " + str(err)) + sys.exit(1) diff --git a/infrastructure-provisioning/src/project/templates/nginx.conf b/infrastructure-provisioning/src/project/templates/nginx.conf index d3d9d42a99..f3f49588cc 100644 --- a/infrastructure-provisioning/src/project/templates/nginx.conf +++ b/infrastructure-provisioning/src/project/templates/nginx.conf @@ -48,17 +48,17 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; -# auth_ldap_cache_enabled on; -# auth_ldap_cache_expiration_time 10000; -# auth_ldap_cache_size 1000; + auth_ldap_cache_enabled on; + auth_ldap_cache_expiration_time 10000; + auth_ldap_cache_size 1000; -# ldap_server ldap1 { -# url ldap://LDAP_IP:389/LDAP_DN?uid,mail?sub?(&(objectClass=posixAccount)(uid=LDAP_USERNAME)); -# binddn "LDAP_SERVICE_USERNAME,LDAP_DN"; -# binddn_passwd "LDAP_SERVICE_PASSWORD"; -# require valid_user; -# request_timeout 30s; -# } + ldap_server ldap1 { + url ldap://LDAP_IP:389/LDAP_DN?uid,mail?sub?(&(objectClass=posixAccount)); + binddn "LDAP_SERVICE_USERNAME,LDAP_DN"; + binddn_passwd "LDAP_SERVICE_PASSWORD"; + require valid_user; + request_timeout 30s; + } include /etc/nginx/conf.d/*.conf; } From 4e8562dc8fcad4d30352b3353ee4e05d7b8993d3 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 1 Jul 2019 15:17:02 +0300 Subject: [PATCH 236/357] [DLAB-828]: reset key label on form clear --- .../project/project-form/project-form.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index c3f7297eec..05d079ceee 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -89,6 +89,7 @@ export class ProjectFormComponent implements OnInit { } public reset() { + this.keyLabel = ''; this.initFormModel(); } From ed009ee794d1d57b6a5d191865ee649fef808041 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 1 Jul 2019 17:43:12 +0300 Subject: [PATCH 237/357] aws - notebook creation bug fixed ldap_user removed --- .../src/general/lib/os/debian/edge_lib.py | 4 +--- .../src/general/lib/os/redhat/edge_lib.py | 4 +--- .../src/project/scripts/configure_nginx_reverse_proxy.py | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py index 89e8913202..31f3095585 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py @@ -58,8 +58,7 @@ 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, - ldap_user): +def install_nginx_ldap(edge_ip, nginx_version, ldap_ip, ldap_dn, ldap_ou, ldap_service_pass, ldap_service_username): try: if not os.path.exists('/tmp/nginx_installed'): sudo('apt-get install -y wget') @@ -91,7 +90,6 @@ def install_nginx_ldap(edge_ip, nginx_version, ldap_ip, ldap_dn, ldap_ou, ldap_s sudo('sed -i \'s/LDAP_OU/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_ou)) sudo('sed -i \'s/LDAP_SERVICE_PASSWORD/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_service_pass)) sudo('sed -i \'s/LDAP_SERVICE_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_service_username)) -# sudo('sed -i \'s/LDAP_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_user)) sudo('sed -i \'s/EDGE_IP/{}/g\' /opt/dlab/templates/conf.d/proxy.conf'.format(edge_ip)) sudo('cp /opt/dlab/templates/nginx.conf /etc/nginx/') sudo('mkdir /etc/nginx/conf.d') diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py index c9077554e4..1a6f7736c0 100644 --- a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py @@ -58,8 +58,7 @@ 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, - ldap_user): +def install_nginx_ldap(edge_ip, nginx_version, ldap_ip, ldap_dn, ldap_ou, ldap_service_pass, ldap_service_username): try: if not os.path.exists('/tmp/nginx_installed'): sudo('yum install -y wget') @@ -97,7 +96,6 @@ def install_nginx_ldap(edge_ip, nginx_version, ldap_ip, ldap_dn, ldap_ou, ldap_s sudo('sed -i \'s/LDAP_OU/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_ou)) sudo('sed -i \'s/LDAP_SERVICE_PASSWORD/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_service_pass)) sudo('sed -i \'s/LDAP_SERVICE_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_service_username)) -# sudo('sed -i \'s/LDAP_USERNAME/{}/g\' /opt/dlab/templates/nginx.conf'.format(ldap_user)) sudo('sed -i \'s/EDGE_IP/{}/g\' /opt/dlab/templates/conf.d/proxy.conf'.format(edge_ip)) sudo('cp /opt/dlab/templates/nginx.conf /etc/nginx/') sudo('mkdir /etc/nginx/conf.d') diff --git a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py index a85eb36cbc..2d564f71f3 100644 --- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py +++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py @@ -56,8 +56,7 @@ 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'], os.environ['{}_iam_user'.format( - os.environ['conf_cloud_provider'])]) + os.environ['ldap_service_username']) except Exception as err: print("Failed install nginx reverse proxy: " + str(err)) sys.exit(1) From ab6f5e71811e425f7d4a7614d62a4e7168213544 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 11:45:32 +0300 Subject: [PATCH 238/357] aws - edge stop/start/status returned --- .../src/edge/fabfile.py | 147 +++++++++--------- .../src/general/scripts/aws/ssn_configure.py | 1 + 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/infrastructure-provisioning/src/edge/fabfile.py b/infrastructure-provisioning/src/edge/fabfile.py index 67001179e5..009f4e4326 100644 --- a/infrastructure-provisioning/src/edge/fabfile.py +++ b/infrastructure-provisioning/src/edge/fabfile.py @@ -31,7 +31,7 @@ def status(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/edge/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -45,47 +45,47 @@ def status(): sys.exit(1) -def run(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - try: - local("~/scripts/{}.py".format('edge_prepare')) - except Exception as err: - traceback.print_exc() - append_result("Failed preparing Edge node.", str(err)) - sys.exit(1) - - try: - local("~/scripts/{}.py".format('edge_configure')) - except Exception as err: - traceback.print_exc() - append_result("Failed configuring Edge node.", str(err)) - sys.exit(1) +#def run(): +# local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], +# os.environ['request_id']) +# local_log_filepath = "/logs/edge/" + local_log_filename +# logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', +# level=logging.DEBUG, +# filename=local_log_filepath) +# +# try: +# local("~/scripts/{}.py".format('edge_prepare')) +# except Exception as err: +# traceback.print_exc() +# append_result("Failed preparing Edge node.", str(err)) +# sys.exit(1) +# +# try: +# local("~/scripts/{}.py".format('edge_configure')) +# except Exception as err: +# traceback.print_exc() +# append_result("Failed configuring Edge node.", str(err)) +# sys.exit(1) # Main function for terminating EDGE node and exploratory environment if exists -def terminate(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - try: - local("~/scripts/{}.py".format('edge_terminate')) - except Exception as err: - traceback.print_exc() - append_result("Failed terminating Edge node.", str(err)) - sys.exit(1) +#def terminate(): +# local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) +# local_log_filepath = "/logs/edge/" + local_log_filename +# logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', +# level=logging.DEBUG, +# filename=local_log_filepath) +# try: +# local("~/scripts/{}.py".format('edge_terminate')) +# except Exception as err: +# traceback.print_exc() +# append_result("Failed terminating Edge node.", str(err)) +# sys.exit(1) # Main function for stopping EDGE node def stop(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/edge/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -98,9 +98,9 @@ def stop(): sys.exit(1) -# Main function for stopping EDGE node +# Main function for starting stoped EDGE node def start(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/edge/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, @@ -113,40 +113,39 @@ def start(): sys.exit(1) -def recreate(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - try: - local("~/scripts/{}.py".format('edge_prepare')) - except Exception as err: - traceback.print_exc() - append_result("Failed preparing Edge node.", str(err)) - sys.exit(1) - - try: - local("~/scripts/{}.py".format('edge_configure')) - except Exception as err: - traceback.print_exc() - append_result("Failed configuring Edge node.", str(err)) - sys.exit(1) - - -def reupload_key(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], - os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - try: - local("~/scripts/{}.py".format('reupload_ssh_key')) - except Exception as err: - traceback.print_exc() - append_result("Failed to reupload key on Edge node.", str(err)) - sys.exit(1) \ No newline at end of file +#def recreate(): +# local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], +# os.environ['request_id']) +# local_log_filepath = "/logs/edge/" + local_log_filename +# logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', +# level=logging.DEBUG, +# filename=local_log_filepath) +# +# try: +# local("~/scripts/{}.py".format('edge_prepare')) +# except Exception as err: +# traceback.print_exc() +# append_result("Failed preparing Edge node.", str(err)) +# sys.exit(1) +# +# try: +# local("~/scripts/{}.py".format('edge_configure')) +# except Exception as err: +# traceback.print_exc() +# append_result("Failed configuring Edge node.", str(err)) +# sys.exit(1) + +#def reupload_key(): +# local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], +# os.environ['request_id']) +# local_log_filepath = "/logs/edge/" + local_log_filename +# logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', +# level=logging.DEBUG, +# filename=local_log_filepath) +# +# try: +# local("~/scripts/{}.py".format('reupload_ssh_key')) +# except Exception as err: +# traceback.print_exc() +# append_result("Failed to reupload key on Edge node.", str(err)) +# sys.exit(1) \ No newline at end of file diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py index 8abb0b1dd1..87ce81c4f0 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py @@ -261,6 +261,7 @@ logging.info('[CONFIGURING DOCKER AT SSN INSTANCE]') print('[CONFIGURING DOCKER AT SSN INSTANCE]') additional_config = [{"name": "base", "tag": "latest"}, + {"name": "edge", "tag": "latest"}, {"name": "project", "tag": "latest"}, {"name": "jupyter", "tag": "latest"}, {"name": "rstudio", "tag": "latest"}, From 2e04372a361b492b8dc4fa9925c69f7d0462688a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 2 Jul 2019 12:01:45 +0300 Subject: [PATCH 239/357] [DLAB-828]: fixed issue with uploading key after form reinit --- .../project/project-form/project-form.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 05d079ceee..c56b84a76b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -100,8 +100,9 @@ export class ProjectFormComponent implements OnInit { public onFileChange($event) { const reader = new FileReader(); + const files = $event.target.files; - if ($event.target.files && $event.target.files.length) { + if (files && files.length) { const [file] = $event.target.files; reader.readAsBinaryString(file); @@ -112,6 +113,7 @@ export class ProjectFormComponent implements OnInit { this.accessKeyValid = this.isValidKey(file.name); this.keyLabel = this.getLabel(file); + $event.target.value = ''; this.cd.markForCheck(); }; } From f368f01f24d4a137973a7c4d765373045bef3ecb Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 2 Jul 2019 12:04:22 +0300 Subject: [PATCH 240/357] [DLAB-827]: cut group name on confirmation dialog for termination --- .../src/app/administration/roles/roles.component.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts index a47c9ee3e6..eb5d9028f9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts @@ -23,6 +23,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; import { RolesGroupsService, HealthStatusService } from '../../core/services'; +import { CheckUtils } from '../../core/util'; import { DICTIONARY } from '../../../dictionary/global.dictionary'; @Component({ @@ -173,11 +174,11 @@ export class RolesComponent implements OnInit { } public groupValidarion(): ValidatorFn { - const duplicateList: any = this.groupsData.map(item => item.group); return ((control: FormControl) => { - if (control.value && duplicateList.includes(this.delimitersFiltering(control.value))) + if (control.value && duplicateList.includes(CheckUtils.delimitersFiltering(control.value))) { return { duplicate: true }; + } if (control.value && !this.groupnamePattern.test(control.value)) return { patterns: true }; @@ -190,10 +191,6 @@ export class RolesComponent implements OnInit { return o1.toLowerCase() === o2.toLowerCase(); } - public delimitersFiltering(resource): string { - return resource.replace(this.delimitersRegex, '').toString().toLowerCase(); - } - public resetDialog() { this.stepperView = false; this.setupGroup = ''; @@ -229,7 +226,7 @@ export class RolesComponent implements OnInit {

User {{ data.user }} will be deleted from {{ data.group }} group.

-

Group {{ data.group }} will be decommissioned.

+

Group {{ data.group }} will be decommissioned.

Do you want to proceed?

@@ -237,7 +234,7 @@ export class RolesComponent implements OnInit {
`, - styles: [] + styles: [`.group-name { max-width: 96%; display: inline-block; }`] }) export class ConfirmDeleteUserAccountDialogComponent { constructor( From 1ac29a1aab35f7cbecfb7dc2ec584469820391a3 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 12:19:49 +0300 Subject: [PATCH 241/357] aws - edge stop/start/status Docker file returned --- README.md | 2539 ----------------------------------------------------- 1 file changed, 2539 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 88d49dee67..0000000000 --- a/README.md +++ /dev/null @@ -1,2539 +0,0 @@ -DLAB Overview -============= - -------- -CONTENTS -------- - -[What is DLAB?](#What_is_DLAB) - -    [How to Contribute](CONTRIBUTING.md) - -[Logical architecture](#Logical_architecture) - -[Physical architecture](#Physical_architecture) - -[DLab Deployment](#DLab_Deployment) - -        [Prerequisites](#Prerequisites) - -        [Preparing environment for DLab deployment](#Env_for_DLab) - -        [Structure of main DLab directory](#DLab_directory) - -        [Structure of log directory](#log_directory) - -        [Self-Service Node](#Self_Service_Node) - -        [Edge Node](#Edge_Node) - -        [Notebook node](#Notebook_node) - -        [EMR cluster](#EMR_cluster) - -        [Configuration files](#Configuration_files) - -        [Starting/Stopping services](#Starting_Stopping_services) - -        [Billing report](#Billing_Report) - -        [Backup and Restore](#Backup_and_Restore) - -        [GitLab server](#GitLab_server) - -        [Troubleshooting](#Troubleshooting) - -[Development](#Development) - -        [Folder structure](#Folder_structure) - -        [Pre-requisites](#Pre-requisites) - -        [Java back-end services](#Java_back_end_services) - -        [Front-end](#Front_end) - -        [How to setup local development environment](#setup_local_environment) - -        [How to run locally](#run_locally) - -        [Infrastructure provisioning](#Infrastructure_provisioning) - -        [LDAP Authentication](#LDAP_Authentication) - -        [Azure OAuth2 Authentication](#Azure_OAuth2_Authentication) - ---------------- -# What is DLAB? - -DLab is an essential toolset for analytics. It is a self-service Web Console, used to create and manage exploratory environments. It allows teams to spin up analytical environments with best of breed open-source tools just with a single click of the mouse. Once established, environment can be managed by an analytical team itself, leveraging simple and easy-to-use Web Interface. -

See more at dlab.opensource.epam.com.

- ----------------------------- -# Logical architecture - -The following diagram demonstrate high-level logical architecture. - -![Logical architecture](doc/logical_architecture.png) - -The diagram shows main components of DLab, which is a self-service for the infrastructure deployment and interaction with it. The purpose of each component is described below. - -## Self-Service - -Self-Service is a service, which provides RESTful user API with Web User Interface for data scientist. It tightly interacts with Provisioning Service and Database. Self-Service delegates all user\`s requests to Provisioning Service. After execution of certain request from Self-service, Provisioning Service returns response about corresponding action happened with particular resource. Self-service, then, saves this response into Database. So, each time Self-Service receives request about status of provisioned infrastructure resources – it loads it from Database and propagates to Web UI. - -## Billing - -Billing is a module, which provides a loading of the billing report for the environment to the database. It can be running as part of the Self-Service or a separate process. - -## Provisioning Service - -The Provisioning Service is a RESTful service, which provides APIs for provisioning of the user’s infrastructure. Provisioning Service receives the request from Self-Service, afterwards it forms and sends a command to the docker to execute requested action. Docker executes the command and generates a response.json file. Provisioning service analyzes response.json and responds to initial request of Self-Service, providing status-related information of the instance. - -## Security service - -Security Service is RESTful service, which provides authorization API for Self-Service and Provisioning Service via LDAP. - -## Docker - -Docker is an infrastructure-provisioning module based on Docker service, which provides low-level actions for infrastructure management. - -## Database - -Database serves as a storage with description of user infrastructure, user’s settings and service information. - ------------------------------ -# Physical architecture - -The following diagrams demonstrate high-level physical architecture of DLab in AWS and Azure. - -![Physical architecture](doc/physical_architecture.png) - -![Physical architecture](doc/azure_dlab_arch.png) - -## Main components - -- Self-service node (SSN) -- Edge node -- Notebook node (Jupyter, Rstudio, etc.) -- Data engine cluster -- Data engine cluster as a service provided with Cloud - -## Self-service node (SSN) - -Creation of self-service node – is the first step for deploying DLab. SSN is a main server with following pre-installed services: - -- DLab Web UI – is Web user interface for managing/deploying all components of DLab. It is accessible by the following URL: http[s]://SSN\_Public\_IP\_or\_Public\_DNS -- MongoDB – is a database, which contains part of DLab’s configuration, user’s exploratory environments description as well as user’s preferences. -- Docker – used for building DLab Docker containers, which will be used for provisioning other components. -- Jenkins – is an alternative to Web UI. It is accessible by the following link: http[s]://SSN\_Public\_IP\_or\_Public\_DNS/jenkins - -Elastic(Static) IP address is assigned to an SSN Node, so you are free to stop|start it and and SSN node's IP address won’t change. - -## Edge node - -Setting up Edge node is the first step that user is asked to do once logged into DLab. This node is used as proxy server and SSH gateway for the user. Through Edge node users can access Notebook via HTTP and SSH. Edge Node has a Squid HTTP web proxy pre-installed. - -## Notebook node - -The next step is setting up a Notebook node (or a Notebook server). It is a server with pre-installed applications and libraries for data processing, data cleaning and transformations, numerical simulations, statistical modeling, machine learning, etc. Following analytical tools are currently supported in DLab and can be installed on a Notebook node: - -- Jupyter -- RStudio -- Apache Zeppelin -- TensorFlow + Jupyter -- Deep Learning + Jupyter - -Apache Spark is also installed for each of the analytical tools above. - -**Note:** terms 'Apache Zeppelin' and 'Apache Spark' hereinafter may be referred to as 'Zeppelin' and 'Spark' respectively or may have original reference. - -## Data engine cluster - -After deploying Notebook node, user can create one of the cluster for it: -- Data engine - Spark standalone cluster -- Data engine service - cloud managed cluster platform (EMR for AWS or Dataproc for GCP) -That simplifies running big data frameworks, such as Apache Hadoop and Apache Spark to process and analyze vast amounts of data. Adding cluster is not mandatory and is only needed in case additional computational resources are required for job execution. ----------------------- -# DLab Deployment - -## Prerequisites -#### In Amazon cloud -Prerequisites: - - - SSH key for EC2 instances. This key could be created through Amazon Console. - - IAM user - - AWS access key ID and secret access key - - The following permissions should be assigned for IAM user: - -``` -{ - "Version": "2012-10-17", - "Statement": [ - { - "Action": [ - "iam:ListRoles", - "iam:CreateRole", - "iam:CreateInstanceProfile", - "iam:PutRolePolicy", - "iam:AddRoleToInstanceProfile", - "iam:PassRole", - "iam:GetInstanceProfile", - "iam:ListInstanceProfilesForRole" - "iam:RemoveRoleFromInstanceProfile", - "iam:DeleteInstanceProfile", - "iam:TagRole" - ], - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": [ - "ec2:DescribeImages", - "ec2:CreateTags", - "ec2:DescribeRouteTables", - "ec2:CreateRouteTable", - "ec2:AssociateRouteTable", - "ec2:DescribeVpcEndpoints", - "ec2:CreateVpcEndpoint", - "ec2:ModifyVpcEndpoint", - "ec2:DescribeInstances", - "ec2:RunInstances", - "ec2:DescribeAddresses", - "ec2:AllocateAddress", - "ec2:DescribeInstances", - "ec2:AssociateAddress", - "ec2:DisassociateAddress", - "ec2:ReleaseAddress", - "ec2:TerminateInstances" - ], - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": [ - "s3:ListAllMyBuckets", - "s3:CreateBucket", - "s3:PutBucketTagging", - "s3:GetBucketTagging" - ], - "Effect": "Allow", - "Resource": "*" - } - ] -} -``` - -#### In Azure cloud - -Prerequisites: - -- IAM user with Contributor permissions. -- Service principal and JSON based auth file with clientId, clientSecret and tenantId. - -**Note:** The following permissions should be assigned to the service principal: - -- Windows Azure Active Directory -- Microsoft Graph -- Windows Azure Service Management API - -#### In Google cloud (GCP) - -Prerequisites: - -- IAM user -- Service account and JSON auth file for it. In order to get JSON auth file, Key should be created for service account through Google cloud console. -## Preparing environment for DLab deployment - -#### In Amazon cloud -If you want to deploy DLab from inside of your AWS account, you can use the following instruction: - -- Create an EC2 instance with the following settings: - - Shape of the instance shouldn't be less than t2.medium - - The instance should have access to Internet in order to install required prerequisites - - The instance should have access to further DLab installation - - AMI - Ubuntu 16.04 - - IAM role with [policy](#AWS_SSN_policy) should be assigned to the instance -- Connect to the instance via SSH and run the following commands: -``` - sudo su - apt-get update - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - apt-get update - apt-cache policy docker-ce - apt-get install -y docker-ce=17.06.2~ce-0~ubuntu - usermod -a -G docker ubuntu - pip install fabric==1.14.0 -``` -- Clone DLab repository and run deploy script. - -## Structure of main DLab directory - -DLab’s SSN node main directory structure is as follows: - - /opt - └───dlab - ├───conf - ├───sources - ├───template - ├───tmp - │ └───result - └───webapp - -- conf – contains configuration for DLab Web UI and back-end services; -- sources – contains all Docker/Python scripts, templates and files for provisioning; -- template – docker’s templates; -- tmp –temporary directory of DLab; -- tmp/result – temporary directory for Docker’s response files; -- webapp – contains all .jar files for DLab Web UI and back-end - services. - -## Structure of log directory - -SSN node structure of log directory is as follows: - - /var - └───opt - └───dlab - └───log - ├───dataengine - ├───dateengine-service - ├───edge - ├───notebook - └───ssn - -These directories contain the log files for each template and for DLab back-end services. -- ssn – contains logs of back-end services; -- provisioning.log – Provisioning Service log file; -- security.log – Security Service log file; -- selfservice.log – Self-Service log file; -- edge, notebook, dataengine, dataengine-service – contains logs of Python scripts. - -## Self-Service Node - -### Create - -Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. -For each cloud provider, prerequisites are different. - -#### In Amazon cloud - -To build SSN node, following steps should be executed: - -1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. -2. Go to *dlab* directory. -3. Execute following script: -``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXXXX --aws_region us-west-2 --conf_os_family debian --conf_cloud_provider aws --aws_vpc_id vpc-xxxxx --aws_subnet_id subnet-xxxxx --aws_security_groups_ids sg-xxxxx,sg-xxxx --key_path /root/ --conf_key_name Test --conf_tag_resource_id dlab --aws_account_id xxxxxxxx --aws_billing_bucket billing_bucket --aws_report_path /billing/directory/ --action create -``` - -This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. - -List of parameters for SSN node deployment: - -| Parameter | Description/Value | -|---------------------------|-----------------------------------------------------------------------------------------| -| conf\_service\_base\_name | Any infrastructure value (should be unique if multiple SSN’s have been deployed before) | -| aws\_access\_key | AWS user access key | -| aws\_secret\_access\_key | AWS user secret access key | -| aws\_region | AWS region | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (AWS) -| conf\_duo\_vpc\_enable | "true" - for installing DLab into two Virtual Private Clouds (VPCs) or "false" - for installing DLab into one VPC. Also this parameter isn't required when deploy DLab in one VPC -| aws\_vpc\_id | ID of the VPC | -| aws\_subnet\_id | ID of the public subnet | -| aws\_security\_groups\_ids| One or more ID\`s of AWS Security Groups, which will be assigned to SSN node | -| key\_path | Path to admin key (without key name) | -| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | -| conf\_tag\_resource\_id | The name of tag for billing reports | -| aws\_account\_id | The The ID of Amazon account | -| aws\_billing\_bucket | The name of S3 bucket where billing reports will be placed | -| aws\_report\_path | The path to billing reports directory in S3 bucket. This parameter isn't required when billing reports are placed in the root of S3 bucket. | -| action | In case of SSN node creation, this parameter should be set to “create” -| workspace\_path | Path to DLab sources root - -**Note:** If the following parameters are not specified, they will be created automatically: -- aws\_vpc\_id -- aws\_subnet\_id -- aws\_sg\_ids - -**Note:** If billing won't be using, the following parameters are not required: -- aws\_account\_id -- aws\_billing\_bucket -- aws\_report\_path - -After SSN node deployment following AWS resources will be created: - -- SSN EC2 instance -- Elastic IP for SSN instance -- IAM role and EC2 Instance Profile for SSN -- Security Group for SSN node (if it was specified, script will attach the provided one) -- VPC, Subnet (if they have not been specified) for SSN and EDGE nodes -- S3 bucket – its name will be \-ssn-bucket. This bucket will contain necessary dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) -- S3 bucket for for collaboration between Dlab users. Its name will be \-shared-bucket - -#### In Azure cloud - -To build SSN node, following steps should be executed: - -1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed -2. Go to *dlab* directory -3. To have working billing functionality please review Billing configuration note and use proper parameters for SSN node deployment -4. To use Data Lake Store please review Azure Data Lake usage pre-requisites note and use proper parameters for SSN node deployment -5. Execute following deploy_dlab.py script: -``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --azure_region westus2 --conf_os_family debian --conf_cloud_provider azure --azure_vpc_name vpc-test --azure_subnet_name subnet-test --azure_security_group_name sg-test1,sg-test2 --key_path /root/ --conf_key_name Test --azure_auth_path /dir/file.json --action create -``` - -This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. - -List of parameters for SSN node deployment: - -| Parameter | Description/Value | -|-----------------------------------|-----------------------------------------------------------------------------------------| -| conf\_service\_base\_name | Any infrastructure value (should be unique if multiple SSN’s have been deployed before) | -| azure\_resource\_group\_name | Resource group name (could be the same as service base name | -| azure\_region | Azure region | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (Azure) | -| azure\_vpc\_name | Name of the Virtual Network (VN) | -| azure\_subnet\_name | Name of the Azure subnet | -| azure\_security\_groups\_name | One or more Name\`s of Azure Security Groups, which will be assigned to SSN node | -| azure\_ssn\_instance\_size | Instance size of SSN instance in Azure | -| key\_path | Path to admin key (without key name) | -| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | -| azure\_auth\_path | Full path to auth json file | -| azure\_offer\_number | Azure offer id number | -| azure\_currency | Currency that is used for billing information(e.g. USD) | -| azure\_locale | Locale that is used for billing information(e.g. en-US) | -| azure\_region\_info | Region info that is used for billing information(e.g. US) | -| azure\_datalake\_enable | Support of Azure Data Lake (true/false) | -| azure\_oauth2\_enabled | Defines if Azure OAuth2 authentication mechanisms is enabled(true/false) | -| azure\_validate\_permission\_scope| Defines if DLab verifies user's permission to the configured resource(scope) during login with OAuth2 (true/false). If Data Lake is enabled default scope is Data Lake Store Account, else Resource Group, where DLab is deployed, is default scope. If user does not have any role in scope he/she is forbidden to log in -| azure\_application\_id | Azure application ID that is used to log in users in DLab | -| azure\_ad\_group\_id | ID of group in Active directory whose members have full access to shared folder in Azure Data Lake Store | -| action | In case of SSN node creation, this parameter should be set to “create” | - -**Note:** If the following parameters are not specified, they will be created automatically: -- azure\_vpc\_nam -- azure\_subnet\_name -- azure\_security\_groups\_name - -**Note:** Billing configuration: - -To know azure\_offer\_number open [Azure Portal](https://portal.azure.com), go to Subscriptions and open yours, then click Overview and you should see it under Offer ID property: - -![Azure offer number](doc/azure_offer_number.png) - -Please see [RateCard API](https://msdn.microsoft.com/en-us/library/mt219004.aspx) to get more details about azure\_offer\_number, -azure\_currency, azure\_locale, azure\_region_info. These DLab deploy properties correspond to RateCard API request parameters. - -**Note:** Azure Data Lake usage pre-requisites: - -1. Configure application in Azure portal and grant proper permissions to it. -- Open *Azure Active Directory* tab, then *App registrations* and click *New application registration* -- Fill in ui form with the following parameters *Name* - put name of the new application, *Application type* - select Native, *Sign-on URL* put any valid url as it will be updated later -- Grant proper permissions to the application. Select the application you just created on *App registration* view, then click *Required permissions*, then *Add->Select an API-> In search field type MicrosoftAzureQueryService* and press *Select*, then check the box *Have full access to the Azure Data Lake service* and save the changes. Repeat the same actions for *Windows Azure Active Directory* API (available on *Required permissions->Add->Select an API*) and the box *Sign in and read user profile* -- Get *Application ID* from application properties it will be used as azure_application_id for deploy_dlap.py script -2. Usage of Data Lake resource predicts shared folder where all users can write or read any data. To manage access to this folder please create ot use existing group in Active Directory. All users from this group will have RW access to the shared folder. Put ID(in Active Directory) of the group as *azure_ad_group_id* parameter to deploy_dlab.py script -3. After execution of deploy_dlab.py script go to the application created in step 1 and change *Redirect URIs* value to the https://SSN_HOSTNAME/ where SSN_HOSTNAME - SSN node hostname - -After SSN node deployment following Azure resources will be created: - -- Resource group where all DLAb resources will be provisioned -- SSN Virtual machine -- Static public IP address dor SSN virtual machine -- Network interface for SSN node -- Security Group for SSN node (if it was specified, script will attach the provided one) -- Virtual network and Subnet (if they have not been specified) for SSN and EDGE nodes -- Storage account and blob container for necessary further dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) -- Storage account and blob container for collaboration between Dlab users -- If support of Data Lake is enabled: Data Lake and shared directory will be created - -#### In Google cloud (GCP) - -To build SSN node, following steps should be executed: - -1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. -2. Go to *dlab* directory. -3. Execute following script: -``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab --gcp_region us-west1 --gcp_zone us-west1-a --conf_os_family debian --conf_cloud_provider gcp --key_path /key/path/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create -``` - -This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. - -List of parameters for SSN node deployment: - -| Parameter | Description/Value | -|------------------------------|-----------------------------------------------------------------------------------------| -| conf\_service\_base\_name | Any infrastructure value (should be unique if multiple SSN’s have been deployed before) | -| gcp\_region | GCP region | -| gcp\_zone | GCP zone | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (GCP) | -| gcp\_vpc\_name | Name of the Virtual Network (VN) | -| gcp\_subnet\_name | Name of the GCP subnet | -| gcp\_firewall\_name | One or more Name\`s of GCP Security Groups, which will be assigned to SSN node | -| key\_path | Path to admin key (without key name) | -| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | -| gcp\_service\_account\_path | Full path to auth json file | -| gcp\_ssn\_instance\_size | Instance size of SSN instance in GCP | -| gcp\_project\_id | ID of GCP project | -| action | In case of SSN node creation, this parameter should be set to “create” | - - -**Note:** If you gonna use Dataproc cluster, be aware that Dataproc has limited availability in GCP regions. [Cloud Dataproc availability by Region in GCP](https://cloud.google.com/about/locations/) - -After SSN node deployment following GCP resources will be created: - -- SSN VM instance -- External IP address for SSN instance -- IAM role and Service account for SSN -- Security Groups for SSN node (if it was specified, script will attach the provided one) -- VPC, Subnet (if they have not been specified) for SSN and EDGE nodes -- Bucket – its name will be \-ssn-bucket. This bucket will contain necessary dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) -- Bucket for for collaboration between Dlab users. Its name will be \-shared-bucket - -### Terminate - -Terminating SSN node will also remove all nodes and components related to it. Basically, terminating Self-service node will terminate all DLab’s infrastructure. -Example of command for terminating DLab environment: - -#### In Amazon -``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXX --aws_region us-west-2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider aws --action terminate -``` -List of parameters for SSN node termination: - -| Parameter | Description/Value | -|----------------------------|------------------------------------------------------------------------------------| -| conf\_service\_base\_name | Unique infrastructure value | -| aws\_access\_key | AWS user access key | -| aws\_secret\_access\_key | AWS user secret access key | -| aws\_region | AWS region | -| key\_path | Path to admin key (without key name) | -| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (AWS) | -| action | terminate | - -#### In Azure -``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --azure_vpc_name vpc-test --azure_resource_group_name resource-group-test --azure_region westus2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider azure --azure_auth_path /dir/file.json --action terminate -``` -List of parameters for SSN node termination: - -| Parameter | Description/Value | -|----------------------------|------------------------------------------------------------------------------------| -| conf\_service\_base\_name | Unique infrastructure value | -| azure\_region | Azure region | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (Azure) | -| azure\_vpc\_name | Name of the Virtual Network (VN) | -| key\_path | Path to admin key (without key name) | -| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | -| azure\_auth\_path | Full path to auth json file | -| action | terminate | - - -#### In Google cloud -``` -/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --gcp_project_id project_id --conf_service_base_name dlab --gcp_region us-west1 --gcp_zone us-west1-a --key_path /root/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider gcp --gcp_service_account_path /path/to/auth/file.json --action terminate -``` -List of parameters for SSN node termination: - -| Parameter | Description/Value | -|------------------------------|-----------------------------------------------------------------------------------------| -| conf\_service\_base\_name | Any infrastructure value (should be unique if multiple SSN’s have been deployed before) | -| gcp\_region | GCP region | -| gcp\_zone | GCP zone | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (GCP) | -| key\_path | Path to admin key (without key name) | -| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | -| gcp\_service\_account\_path | Full path to auth json file | -| gcp\_project\_id | ID of GCP project | -| action | In case of SSN node termination, this parameter should be set to “terminate” | - - -## Edge Node - -Gateway node (or an Edge node) is an instance(virtual machine) provisioned in a public subnet. It serves as an entry point for accessing user’s personal analytical environment. It is created by an end-user, whose public key will be uploaded there. Only via Edge node, DLab user can access such application resources as notebook servers and dataengine clusters. Also, Edge Node is used to setup SOCKS proxy to access notebook servers via Web UI and SSH. Elastic(Static) IP address is assigned to an Edge Node. In case Edge node instance has been removed by mistake, there is an option to re-create it and Edge node IP address won’t change. - -### Create - -In order to create Edge node using DLab Web UI – login and, click on the button “Upload” (Depending on authorization provider that was chosen on deployment stage, user may be taken from [LDAP](#LDAP_Authentication) or from [Azure AD (Oauth2)](#Azure_OAuth2_Authentication)). Choose user’s SSH public key and after that click on the button “Create”. Edge node will be deployed and corresponding instance (virtual machine) will be started. - -#### In Amazon - -The following AWS resources will be created: -- Edge EC2 instance -- Elastic IP address for Edge EC2 instance -- User's S3 bucket -- Security Group for user's Edge instance -- Security Group for all further user's Notebook instances -- Security Groups for all further user's master nodes of data engine cluster -- Security Groups for all further user's slave nodes of data engine cluster -- IAM Roles and Instance Profiles for user's Edge instance -- IAM Roles and Instance Profiles all further user's Notebook instances -- User private subnet. All further nodes (Notebooks, EMR clusters) will be provisioned in different subnet than SSN. - -List of parameters for Edge node creation: - -| Parameter | Description/Value | -|--------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Name of the user | -| aws\_vpc\_id | ID of AWS VPC where infrastructure is being deployed | -| aws\_region | AWS region where infrastructure was deployed | -| aws\_security\_groups\_ids | One or more id’s of the SSN instance security group | -| aws\_subnet\_id | ID of the AWS public subnet where Edge will be deployed | -| aws\_private\_subnet\_prefix | Prefix of the private subnet | -| conf\_tag\_resource\_id | The name of tag for billing reports | -| action | create | - -#### In Azure - -The following Azure resources will be created: -- Edge virtual machine -- Static public IP address for Edge virtual machine -- Network interface for Edge node -- Security Group for user's Edge instance -- Security Group for all further user's Notebook instances -- Security Groups for all further user's master nodes of data engine cluster -- Security Groups for all further user's slave nodes of data engine cluster -- User's private subnet. All further nodes (Notebooks, data engine clusters) will be provisioned in different subnet than SSN. -- User's storage account and blob container - -List of parameters for Edge node creation: - -| Parameter | Description/Value | -|--------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Name of the user | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| azure\_region | Azure region where infrastructure was deployed | -| azure\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | -| azure\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | -| action | create | - -#### In Google cloud - -The following GCP resources will be created: -- Edge VM instance -- External static IP address for Edge VM instance -- Security Group for user's Edge instance -- Security Group for all further user's Notebook instances -- Security Groups for all further user's master nodes of data engine cluster -- Security Groups for all further user's slave nodes of data engine cluster -- User's private subnet. All further nodes (Notebooks, data engine clusters) will be provisioned in different subnet than SSN. -- User's bucket - -List of parameters for Edge node creation: - -| Parameter | Description/Value | -|--------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Name of the user | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone where infrastructure was deployed | -| gcp\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | -| gcp\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | -| gcp\_project\_id | ID of GCP project | -| action | create | - -### Start/Stop - -To start/stop Edge node, click on the button which looks like a cycle on the top right corner, then click on the button which is located in “Action” field and in the drop-down menu click on the appropriate action. - -#### In Amazon - -List of parameters for Edge node starting/stopping: - -| Parameter | Description/Value | -|---------------------------|--------------------------------------------------------------| -| conf\_resource | edge | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| edge\_user\_name | Name of the user | -| aws\_region | AWS region where infrastructure was deployed | -| action | start/stop | - -#### In Azure - -List of parameters for Edge node starting: - -| Parameter | Description/Value | -|------------------------------|---------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| edge\_user\_name | Name of the user | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| azure\_region | Azure region where infrastructure was deployed | -| action | start | - -List of parameters for Edge node stopping: - -| Parameter | Description/Value | -|------------------------------|---------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| edge\_user\_name | Name of the user | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| action | stop | - -#### In Google cloud - -List of parameters for Edge node starting/stopping: - -| Parameter | Description/Value | -|--------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| edge\_user\_name | Name of the user | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone where infrastructure was deployed | -| gcp\_project\_id | ID of GCP project | -| action | start/stop | - -### Recreate - -In case Edge node was damaged, or terminated manually, there is an option to re-create it. - -If Edge node was removed for some reason, to re-create it, click on the status button close to logged in users’s name (top right corner of the screen).Then click on gear icon in Actions column and choose “Recreate”. - -List of parameters for Edge node recreation: - -#### In Amazon - -| Parameter | Description/Value | -|----------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (Debian/RedHat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Name of the user | -| aws\_vpc\_id | ID of AWS VPC where infrastructure is being deployed | -| aws\_region | AWS region where infrastructure was deployed | -| aws\_security\_groups\_ids | ID of the SSN instance's AWS security group | -| aws\_subnet\_id | ID of the AWS public subnet where Edge was deployed | -| edge\_elastic\_ip | AWS Elastic IP address which was associated to Edge node | -| conf\_tag\_resource\_id | The name of tag for billing reports | -| action | Create | - -#### In Azure - -| Parameter | Description/Value | -|------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (Debian/RedHat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Name of the user | -| azure\_vpc\_name | NAme of Azure Virtual network where all infrastructure is being deployed | -| azure\_region | Azure region where all infrastructure was deployed | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| azure\_subnet\_name | Name of the Azure public subnet where Edge was deployed | -| action | Create | - -#### In Google cloud -| Parameter | Description/Value | -|--------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | edge | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Name of the user | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone where infrastructure was deployed | -| gcp\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | -| gcp\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | -| gcp\_project\_id | ID of GCP project | -| action | create | - -## Notebook node - -Notebook node is an instance (virtual machine), with preinstalled analytical software, needed dependencies and with pre-configured kernels and interpreters. It is the main part of personal analytical environment, which is setup by a data scientist. It can be Created, Stopped and Terminated. To support variety of analytical needs - Notebook node can be provisioned on any of cloud supported instance shape for your particular region. From analytical software, which is already pre-installed on a notebook node, end users can access (read/write) data stored on buckets/containers. - -### Create - -To create Notebook node, click on the “Create new” button. Then, in drop-down menu choose template type (jupyter/rstudio/zeppelin/tensor), enter notebook name and choose instance shape. After clicking the button “Create”, notebook node will be deployed and started. - -List of parameters for Notebook node creation: - -#### In Amazon - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| aws\_notebook\_instance\_type | Value of the Notebook EC2 instance shape | -| aws\_region | AWS region where infrastructure was deployed | -| aws\_security\_groups\_ids | ID of the SSN instance's security group | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| conf\_tag\_resource\_id | The name of tag for billing reports | -| git\_creds | User git credentials in JSON format | -| action | Create | - -**Note:** For format of git_creds see "Manage git credentials" lower. - -#### In Azure - -| Parameter | Description/Value | -|---------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| azure\_notebook\_instance\_size | Value of the Notebook virtual machine shape | -| azure\_region | Azure region where infrastructure was deployed | -| azure\_vpc\_name | NAme of Azure Virtual network where all infrastructure is being deployed | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| git\_creds | User git credentials in JSON format | -| action | Create | - -#### In Google cloud - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| gcp\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | -| gcp\_project\_id | ID of GCP project | -| gcp\_notebook\_instance\_size | Value of the Notebook VM instance size | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone where infrastructure was deployed | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| git\_creds | User git credentials in JSON format | -| action | Create | - -### Stop - -In order to stop Notebook node, click on the “gear” button in Actions column. From the drop-down menu click on “Stop” action. - -List of parameters for Notebook node stopping: - -#### In Amazon - -| Parameter | Description/Value | -|---------------------------|--------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| aws\_region | AWS region where infrastructure was deployed | -| action | Stop | - -#### In Azure - -| Parameter | Description/Value | -|---------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| action | Stop | - -#### In Google cloud - -| Parameter | Description/Value | -|---------------------------|--------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone where infrastructure was deployed | -| gcp\_project\_id | ID of GCP project | -| action | Stop | - -### Start - -In order to start Notebook node, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Start” action. - -List of parameters for Notebook node start: - -#### In Amazon - -| Parameter | Description/Value | -|---------------------------|--------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| aws\_region | AWS region where infrastructure was deployed | -| git\_creds | User git credentials in JSON format | -| action | start | - -**Note:** For format of git_creds see "Manage git credentials" lower. - -#### In Azure - -| Parameter | Description/Value | -|---------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| azure\_region | Azure region where infrastructure was deployed | -| git\_creds | User git credentials in JSON format | -| action | start | - -#### In Google cloud - -| Parameter | Description/Value | -|---------------------------|--------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone where infrastructure was deployed | -| gcp\_project\_id | ID of GCP project | -| git\_creds | User git credentials in JSON format | -| action | Stop | - -### Terminate - -In order to terminate Notebook node, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Terminate” action. - -List of parameters for Notebook node termination: - -#### In Amazon - -| Parameter | Description/Value | -|---------------------------|--------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| aws\_region | AWS region where infrastructure was deployed | -| action | terminate | - -**Note:** If terminate action is called, all connected data engine clusters will be removed. - -#### In Azure - -| Parameter | Description/Value | -|---------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| action | terminate | - -#### In Google cloud - -| Parameter | Description/Value | -|---------------------------|--------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone where infrastructure was deployed | -| gcp\_project\_id | ID of GCP project | -| git\_creds | User git credentials in JSON format | -| action | Stop | - -### List/Install additional libraries - -In order to list available libraries (OS/Python2/Python3/R/Others) on Notebook node, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. - -#### In Amazon - -List of parameters for Notebook node to **get list** of available libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| aws\_region | AWS region where infrastructure was deployed | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| action | lib_list | - -**Note:** This operation will return a file with response **[edge_user_name]\_[application]\_[request_id]\_all\_pkgs.json** - -**Example** of available libraries in response (type->library->version): - -``` -{ - "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, - "pip2": {"requests": "N/A", "configparser": "N/A"}, - "pip3": {"configparser": "N/A"}, - "r_pkg": {"rmarkdown": "1.5"}, - "others": {"Keras": "N/A"} -} -``` - - -List of parameters for Notebook node to **install** additional libraries: - -| Parameter | Description/Value | -|-------------------------------|--------------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| aws\_region | AWS region where infrastructure was deployed | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| -| action | lib_install | - -**Example** of additional_libs parameter: - -``` -{ - ... - "libs": [ - {"group": "os_pkg", "name": "nmap"}, - {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, - {"group": "pip3", "name": "configparser"}, - {"group": "r_pkg", "name": "rmarkdown"}, - {"group": "others", "name": "Keras"} - ] - ... -} -``` - -#### In Azure - -List of parameters for Notebook node to **get list** of available libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| action | lib_list | - -List of parameters for Notebook node to **install** additional libraries: - -| Parameter | Description/Value | -|-------------------------------|--------------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| -| action | lib_install | - - -#### In Google cloud - -List of parameters for Notebook node to **get list** of available libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| gcp\_project\_id | ID of GCP project | -| gcp\_zone | GCP zone name | -| action | lib_list | - -List of parameters for Notebook node to **install** additional libraries: - -| Parameter | Description/Value | -|-------------------------------|--------------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| gcp\_project\_id | ID of GCP project | -| gcp\_zone | GCP zone name | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| -| action | lib_install | - -### Manage git credentials - -In order to manage git credentials on Notebook node, click on the button “Git credentials”. Then in menu you can add or edit existing credentials. - -#### In Amazon - -List of parameters for Notebook node to **manage git credentials**: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| aws\_region | AWS region where infrastructure was deployed | -| git\_creds | User git credentials in JSON format | -| action | git\_creds | - -**Example** of git_creds parameter: - -``` -[{ - "username": "Test User", - "email": "test@example.com", - "hostname": "github.com", - "login": "testlogin", - "password": "testpassword" -}, ...] -``` - -**Note:** Fields "username" and "email" are used for commits (displays Author in git log). - -**Note:** Leave "hostname" field empty to apply login/password by default for all services. - -**Note:** Also your can use "Personal access tokens" against passwords. - -#### In Azure - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| git\_creds | User git credentials in JSON format | -| action | git\_creds | - -#### In Google cloud - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | notebook | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| gcp\_project\_id | ID of GCP project | -| gcp\_region | GCP region name | -| gcp\_zone | GCP zone name | -| notebook\_instance\_name | Name of the Notebook instance to terminate | -| git\_creds | User git credentials in JSON format | -| action | git\_creds | - -## Dataengine-service cluster - -Dataengine-service is a cluster provided by cloud as a service (EMR on AWS) can be created if more computational resources are needed for executing analytical algorithms and models, triggered from analytical tools. Jobs execution will be scaled to a cluster mode increasing the performance and decreasing execution time. - -### Create - -To create dataengine-service cluster click on the “gear” button in Actions column, and click on “Add computational resources”. Specify dataengine-service version, fill in dataengine-service name, specify number of instances and instance shapes. Click on the “Create” button. - -List of parameters for dataengine-service cluster creation: - -#### In Amazon - -| Parameter | Description/Value | -|-----------------------------|--------------------------------------------------------------------------| -| conf\_resource | dataengine-service | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| emr\_timeout | Value of timeout for dataengine-service during build. | -| emr\_instance\_count | Amount of instance in dataengine-service cluster | -| emr\_master\_instance\_type | Value for dataengine-service EC2 master instance shape | -| emr\_slave\_instance\_type | Value for dataengine-service EC2 slave instances shapes | -| emr\_version | Available versions of dataengine-service (emr-5.2.0/emr-5.3.1/emr-5.6.0) | -| notebook\_instance\_name | Name of the Notebook dataengine-service will be linked to | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| aws\_region | AWS region where infrastructure was deployed | -| conf\_tag\_resource\_id | The name of tag for billing reports | -| action | create | - -**Note:** If “Spot instances” is enabled, dataengine-service Slave nodes will be created as EC2 Spot instances. - -#### In Google cloud - -| Parameter | Description/Value | -|---------------------------------|--------------------------------------------------------------------------| -| conf\_resource | dataengine-service | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| notebook\_instance\_name | Name of the Notebook dataengine-service will be linked to | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| gcp\_subnet\_name | Name of subnet | -| dataproc\_version | Version of Dataproc | -| dataproc\_master\_count | Number of master nodes | -| dataproc\_slave\_count | Number of slave nodes | -| dataproc\_preemptible\_count | Number of preemptible nodes | -| dataproc\_master\_instance\_type| Size of master node | -| dataproc\_slave\_instance\_type | Size of slave node | -| gcp\_project\_id | ID of GCP project | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone name | -| conf\_tag\_resource\_id | The name of tag for billing reports | -| action | create | - -### Terminate - -In order to terminate dataengine-service cluster, click on “x” button which is located in “Computational resources” field. - -List of parameters for dataengine-service cluster termination: - -#### In Amazon - -| Parameter | Description/Value | -|---------------------------|---------------------------------------------------------------------| -| conf\_resource | dataengine-service | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| emr\_cluster\_name | Name of the dataengine-service to terminate | -| notebook\_instance\_name | Name of the Notebook instance which dataengine-service is linked to | -| aws\_region | AWS region where infrastructure was deployed | -| action | Terminate | - -#### In Google cloud - -| Parameter | Description/Value | -|---------------------------|---------------------------------------------------------------------| -| conf\_resource | dataengine-service | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance which dataengine-service is linked to | -| gcp\_project\_id | ID of GCP project | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone name | -| dataproc\_cluster\_name | Dataproc cluster name | -| action | Terminate | - -### List/Install additional libraries - -In order to list available libraries (OS/Python2/Python3/R/Others) on Dataengine-service, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. - -#### In Amazon - -List of parameters for Dataengine-service node to **get list** of available libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine-service | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| computational\_id | Name of Dataengine-service | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| aws\_region | AWS region where infrastructure was deployed | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| action | lib_list | - -**Note:** This operation will return a file with response **[edge_user_name]\_[application]\_[request_id]\_all\_pkgs.json** - -**Example** of available libraries in response (type->library->version): - -``` -{ - "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, - "pip2": {"requests": "N/A", "configparser": "N/A"}, - "pip3": {"configparser": "N/A"}, - "r_pkg": {"rmarkdown": "1.5"}, - "others": {"Keras": "N/A"} -} -``` - - -List of parameters for Dataengine-service to **install** additional libraries: - -| Parameter | Description/Value | -|-------------------------------|--------------------------------------------------------------------------------------| -| conf\_resource | dataengine-service | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| computational\_id | Name of Dataengine-service | -| aws\_region | AWS region where infrastructure was deployed | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| -| action | lib_install | - -**Example** of additional_libs parameter: - -``` -{ - ... - "libs": [ - {"group": "os_pkg", "name": "nmap"}, - {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, - {"group": "pip3", "name": "configparser"}, - {"group": "r_pkg", "name": "rmarkdown"}, - {"group": "others", "name": "Keras"} - ] - ... -} -``` - -#### In Google cloud - -List of parameters for Dataengine-service node to **get list** of available libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine-service | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| gcp\_project\_id | ID of GCP project | -| gcp\_region | GCP region name | -| gcp\_zone | GCP zone name | -| action | lib_list | - -List of parameters for Dataengine-service node to **install** additional libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine-service | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| gcp\_project\_id | ID of GCP project | -| gcp\_region | GCP region name | -| gcp\_zone | GCP zone name | -| action | lib_install | - - -## Dataengine cluster - -Dataengine is cluster based on Standalone Spark framework can be created if more computational resources are needed for executing analytical algorithms, but without additional expenses for cloud provided service. - -### Create - -To create Spark standalone cluster click on the “gear” button in Actions column, and click on “Add computational resources”. Specify dataengine version, fill in dataengine name, specify number of instances and instance shapes. Click on the “Create” button. - -List of parameters for dataengine cluster creation: - -#### In Amazon - -| Parameter | Description/Value | -|--------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| notebook\_instance\_name | Name of the Notebook dataengine will be linked to | -| dataengine\_instance\_count | Number of nodes in cluster | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| aws\_region | Amazon region where all infrastructure was deployed | -| aws\_dataengine\_master\_size | Size of master node | -| aws\_dataengine\_slave\_size | Size of slave node | -| action | create | - -#### In Azure - -| Parameter | Description/Value | -|--------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| notebook\_instance\_name | Name of the Notebook dataengine will be linked to | -| dataengine\_instance\_count | Number of nodes in cluster | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| azure\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | -| azure\_region | Azure region where all infrastructure was deployed | -| azure\_dataengine\_master\_size| Size of master node | -| azure\_dataengine\_slave\_size | Size of slave node | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| azure\_subnet\_name | Name of the Azure public subnet where Edge was deployed | -| action | create | - -#### In Google cloud - -| Parameter | Description/Value | -|------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | -| notebook\_instance\_name | Name of the Notebook dataengine will be linked to | -| gcp\_vpc\_name | GCP VPC name | -| gcp\_subnet\_name | GCP subnet name | -| dataengine\_instance\_count | Number of nodes in cluster | -| gcp\_dataengine\_master\_size| Size of master node | -| gcp\_dataengine\_slave\_size | Size of slave node | -| gcp\_project\_id | ID of GCP project | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone name | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| action | create | - - -### Terminate - -In order to terminate dataengine cluster, click on “x” button which is located in “Computational resources” field. - -List of parameters for dataengine cluster termination: - -#### In Amazon - -| Parameter | Description/Value | -|------------------------------|--------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance which dataengine is linked to | -| computational\_name | Name of cluster | -| aws\_region | AWS region where infrastructure was deployed | -| action | Terminate | - -#### In Azure - -| Parameter | Description/Value | -|------------------------------|--------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| computational\_name | Name of cluster | -| notebook\_instance\_name | Name of the Notebook instance which dataengine is linked to | -| azure\_region | Azure region where infrastructure was deployed | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned| -| action | Terminate | - -#### In Google cloud - -| Parameter | Description/Value | -|------------------------------|--------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| notebook\_instance\_name | Name of the Notebook instance which dataengine is linked to | -| computational\_name | Name of cluster | -| gcp\_project\_id | ID of GCP project | -| gcp\_region | GCP region where infrastructure was deployed | -| gcp\_zone | GCP zone name | -| action | Terminate | - -### List/Install additional libraries - -In order to list available libraries (OS/Python2/Python3/R/Others) on Dataengine, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. - -#### In Amazon - -List of parameters for Dataengine node to **get list** of available libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| computational\_id | Name of cluster | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| action | lib_list | - -**Note:** This operation will return a file with response **[edge_user_name]\_[application]\_[request_id]\_all\_pkgs.json** - -**Example** of available libraries in response (type->library->version): - -``` -{ - "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, - "pip2": {"requests": "N/A", "configparser": "N/A"}, - "pip3": {"configparser": "N/A"}, - "r_pkg": {"rmarkdown": "1.5"}, - "others": {"Keras": "N/A"} -} -``` - - -List of parameters for Dataengine node to **install** additional libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| computational\_id | Name of cluster | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| action | lib_install | - -**Example** of additional_libs parameter: - -``` -{ - ... - "libs": [ - {"group": "os_pkg", "name": "nmap"}, - {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, - {"group": "pip3", "name": "configparser"}, - {"group": "r_pkg", "name": "rmarkdown"}, - {"group": "others", "name": "Keras"} - ] - ... -} -``` - -#### In Azure - -List of parameters for Dataengine node to **get list** of available libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| computational\_id | Name of cluster | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| action | lib_list | - -List of parameters for Dataengine node to **install** additional libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | -| computational\_id | Name of cluster | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| action | lib_install | - - -#### In Google cloud - -List of parameters for Dataengine node to **get list** of available libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| gcp\_project\_id | ID of GCP project | -| gcp\_zone | GCP zone name | -| computational\_id | Name of cluster | -| action | lib_list | - -List of parameters for Dataengine node to **install** additional libraries: - -| Parameter | Description/Value | -|-------------------------------|-----------------------------------------------------------------------------------| -| conf\_resource | dataengine | -| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | -| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | -| edge\_user\_name | Value that previously was used when Edge being provisioned | -| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| gcp\_project\_id | ID of GCP project | -| gcp\_zone | GCP zone name | -| computational\_id | Name of cluster | -| action | lib_install | - - -## Configuration files - -DLab configuration files are located on SSN node by following path: -- /opt/dlab/conf ssn.yml – basic configuration for all java services; -- provisioning.yml – Provisioning Service configuration file;for -- security.yml – Security Service configuration file; -- self-service.yml – Self-Service configuration file. - -## Starting/Stopping services - -All DLab services running as OS services and have next syntax for -starting and stopping: -``` -sudo supervisorctl {start | stop | status} [all | provserv | secserv | ui] -``` -- start – starting service or services; -- stop – stopping service or services; -- status – show status of service or services; -- all – execute command for all services, this option is default; -- provserv – execute command for Provisioning Service; -- secserv – execute command for Security Service; -- ui – execute command for Self-Service. - -## DLab Web UI - -DLab self service is listening to the secure 8443 port. This port is used for secure local communication with provisioning service. - -There is also Nginx proxy server running on Self-Service node, which proxies remote connection to local 8443 port. -Nginx server is listening to both 80 and 443 ports by default. It means that you could access self-service Web UI using non-secure connections (80 port) or secure (443 port). - -Establishing connection using 443 port you should take into account that DLab uses self-signed certificate from the box, however you are free to switch Nginx to use your own domain-verified certificate. - -To disable non-secure connection please do the following: -- uncomment at /etc/nginx/conf.d/nginx_proxy.conf file rule that rewrites all requests from 80 to 443 port; -- reload/restart Nginx web server. - -To use your own certificate please do the following: -- upload your certificate and key to Self-Service node; -- specify at /etc/nginx/conf.d/nginx_proxy.conf file the correct path to your new ssl_certificate and ssl_certificate_key; -- reload/restart Nginx web server. - -## Billing report - -### AWS - -Billing module is implemented as a separate jar file and can be running in the follow modes: - -- part of Self-Service; -- separate system process; -- manual loading or use external scheduler; - -The billing module is running as part of the Self-Service (if billing was switched ON before SSN deployment). For details please refer to section [Self-Service Node](#Self_Service_Node). Otherwise, you should manually configure file billing.yml. See the descriptions how to do this in the configuration file. Please also note, that you should also add an entry in the Mongo database into collection: -``` -{ - "_id": "conf_tag_resource_id", - "Value": "" -} -``` -After you have configured the billing, you can run it as a process of Self-Service. To do this, in the configuration file self-service.yml set the property **BillingSchedulerEnabled** to **true** and restart the Self-Service: -``` -sudo supervisorctl stop ui -sudo supervisorctl start ui -``` -If you want to load report manually, or use external scheduler use following command: -``` -java -jar /opt/dlab/webapp/lib/billing/billing-aws.x.y.jar --conf /opt/dlab/conf/billing.yml -or -java -cp /opt/dlab/webapp/lib/billing/billing-aws.x.y.jar com.epam.dlab.BillingTool --conf /opt/dlab/conf/billing.yml -``` -If you want billing to work as a separate process from the Self-Service use following command: -``` -java -cp /opt/dlab/webapp/lib/billing/billing-aws.x.y.jar com.epam.dlab.BillingScheduler --conf /opt/dlab/conf/billing.yml -``` - -### Azure - -Billing module is implemented as a separate jar file and can be running in the follow modes: - -- part of Self-Service; -- separate system process; - -If you want to start billing module as a separate process use the following command: -``` -java -jar /opt/dlab/webapp/lib/billing/billing-azure.x.y.jar /opt/dlab/conf/billing.yml -``` - -## Backup and Restore - -All DLab configuration files, keys, certificates, jars, database and logs can be saved to backup file. - -Scripts for backup and restore is located in ```dlab_path/tmp/```. Default: ```/opt/dlab/tmp/``` - -List of parameters for run backup: - -| Parameter | Description/Value | -|----------------|-------------------------------------------------------------------------------------------------------------------------| -| --dlab\_path | Path to DLab. Default: /opt/dlab/ | -| --configs | Comma separated names of config files, like "security.yml", etc. Default: all | -| --keys | Comma separated names of keys, like "user_name.pub". Default: all | -| --certs | Comma separated names of SSL certificates and keys, like "dlab.crt", etc. Also available: skip. Default: all | -| --jars | Comma separated names of jar application, like "self-service" (without .jar), etc. Also available: all. Default: skip | -| --db | Mongo DB. Key without arguments. Default: disable | -| --logs | All logs (include docker). Key without arguments. Default: disable | - -List of parameters for run restore: - -| Parameter | Description/Value | -|----------------|-------------------------------------------------------------------------------------------------------------------------| -| --dlab\_path | Path to DLab. Default: /opt/dlab/ | -| --configs | Comma separated names of config files, like "security.yml", etc. Default: all | -| --keys | Comma separated names of keys, like "user_name.pub". Default: all | -| --certs | Comma separated names of SSL certificates and keys, like "dlab.crt", etc. Also available: skip. Default: all | -| --jars | Comma separated names of jar application, like "self-service" (without .jar), etc. Also available: all. Default: skip | -| --db | Mongo DB. Key without arguments. Default: disable | -| --file | Full or relative path to backup file or folder. Required field | -| --force | Force mode. Without any questions. Key without arguments. Default: disable | - -**Note:** You can type ```-h``` or ```--help``` for usage details. - -**Note:** Restore process required stopping services. - -## GitLab server - -Own GitLab server can be deployed from SSN node with script, which located in: - -```dlab_path/tmp/gitlab```. Default: ```/opt/dlab/tmp/gitlab``` - -All initial configuration parameters located in ```gitlab.ini``` file. - -Some of parameters are already setuped from SSN provisioning. - -GitLab uses the same LDAP server as DLab. - -To deploy Gitlab server, set all needed parameters in ```gitlab.ini``` and run script: - -```./gitlab_deploy.py --action [create/terminate]``` - -**Note:** Terminate process uses ```node_name``` to find instance. - -**Note:** GitLab wouldn't be terminated with all environment termination process. - -## Troubleshooting - -If the parameter dlab\_path of configuration file dlab.ini wasn’t changed, the path to DLab service would default to: - -- /opt/dlab/ - main directory of DLab service -- /var/opt/dlab/log/ or /var/log/dlab/ - path to log files - -To check logs of Docker containers run the following commands: -``` -docker ps -a – to get list of containers which were executed. -... -a85d0d3c27aa docker.dlab-dataengine:latest "/root/entrypoint...." 2 hours ago Exited (0) 2 hours ago infallible_gallileo -6bc2afeb888e docker.dlab-jupyter:latest "/root/entrypoint...." 2 hours ago Exited (0) 2 hours ago practical_cori -51b71c5d4aa3 docker.dlab-zeppelin:latest "/root/entrypoint...." 2 hours ago Exited (0) 2 hours ago determined_knuth -... -docker logs – to get log for particular Docker container. -``` - -To change Docker images on existing environment, you can run script on SSN node that rebuilds docker images with the command: -``` -docker-build all #to rebuild all images -``` -or -``` -docker-build #to rebuild certain images -``` - -You can also rebuild images manually by executing the following steps: - -1. SSH to SSN instance -2. go to */opt/dlab/sources/* -3. Modify needed files -[4]. [ONLY FOR AZURE] Copy service principal json file with credentials to base/azure_auth.json -5. Rebuild proper Docker images, using one or several commands (depending on what files you’ve changed): -``` -docker build --build-arg OS= --file general/files//base_Dockerfile -t docker.dlab-base . -docker build --build-arg OS= --file general/files//edge_Dockerfile -t docker.dlab-edge . -docker build --build-arg OS= --file general/files//jupyter_Dockerfile -t docker.dlab-jupyter . -docker build --build-arg OS= --file general/files//rstudio_Dockerfile -t docker.dlab-rstudio . -docker build --build-arg OS= --file general/files//zeppelin_Dockerfile -t docker.dlab-zeppelin . -docker build --build-arg OS= --file general/files//tensor_Dockerfile -t docker.dlab-tensor . -docker build --build-arg OS= --file general/files//tensor-rstudio_Dockerfile -t docker.dlab-tensor-rstudio . -docker build --build-arg OS= --file general/files//deeplearning_Dockerfile -t docker.dlab-deeplearning . -docker build --build-arg OS= --file general/files//dataengine_Dockerfile -t docker.dlab-dataengine . -``` - ----------------- -# Development - -DLab services could be ran in development mode. This mode emulates real work an does not create any resources on cloud provider environment. - -## Folder structure - - dlab - ├───infrastructure-provisioning - └───services - ├───billing - ├───common - ├───provisioning-service - ├───security-service - ├───self-service - └───settings - -- infrastructure-provisioning – code of infrastructure-provisioning module; -- services – back-end services source code; - - billing – billing module for AWS cloud provider only; - - common – reusable code for all services; - - provisioning-service – Provisioning Service; - - security-service – Security Service; - - self-service – Self-Service and UI; - - settings – global settings that are stored in mongo database in development mode; - -## Pre-requisites - -In order to start development of Front-end Web UI part of DLab - Git repository should be cloned and the following packages should be installed: - -- Git 1.7 or higher -- Python 2.7 with library Fabric v1.14.0 -- Docker 1.12 - Infrastructure provisioning - -## Java back-end services - -### Java components description - -#### Common - -Common is a module, which wraps set of reusable code over services. Commonly reused functionality is as follows: - -1. Models -2. REST client -3. Mongo persistence DAO -4. Security models and DAO - -#### Self-Service - -Self-Service provides REST based API’s. It tightly interacts with Provisioning Service and Security Service and actually delegates most of user\`s requests for execution. - -| API class name | Supported actions | Description | -|---------------------------------|-------------------------------------------------------|------------------------| -| BillingResource | Get billing invoice
Export billing invoice in CSV file | Provides billing information. | -| ComputationalResource | Configuration limits
Create
Terminate | Used for computational resources management. | -| EdgeResource | Start
Stop
Status | Manage EDGE node. | -| ExploratoryResource | Create
Status
Start
Stop
Terminate | Used for exploratory environment management. | -| GitCredsResource | Update credentials
Get credentials | Used for exploratory environment management. | -| InfrastructureInfoResource | Get info of environment
Get status of environment | Used for obtaining statuses and additional information about provisioned resources | -| InfrastructureTemplatesResource | Get computation resources templates
Get exploratory environment templates | Used for getting exploratory/computational templates | -| KeyUploaderResource | Check key
Upload key
Recover | Used for Gateway/EDGE node public key upload and further storing of this information in Mongo DB. | -| LibExploratoryResource | Lib groups
Lib list
Lib search
Lib install | User’s authentication. | -| SecurityResource | Login
Authorize
Logout | User’s authentication. | -| UserSettingsResource | Get settings
Save settings | User’s preferences. | - -Some class names may have endings like Aws or Azure(e.g. ComputationalResourceAws, ComputationalResourceAzure, etc...). It means that it's cloud specific class with a proper API - - -#### Provisioning Service - -The Provisioning Service is key, REST based service for management of cloud specific or Docker based environment resources like computational, exploratory, -edge, etc. - -| API class name | Supported actions | Description | -|---------------------------|-----------------------------------------|------------------------------------------------------------------------------| -| ComputationalResource | Create
Terminate | Docker actions for computational resources management. | -| DockerResource | Get Docker image
Run Docker image | Requests and describes Docker images and templates. | -| EdgeResource | Create
Start
Stop | Provides Docker actions for EDGE node management. | -| ExploratoryResource | Create
Start
Stop
Terminate | Provides Docker actions for working with exploratory environment management. | -| GitExploratoryResource | Update git greds | Docker actions to provision git credentials to running notebooks | -| InfrastructureResource | Status | Docker action for obtaining status of DLab infrastructure instances. | -| LibExploratoryResource | Lib list
Install lib | Docker actions to install libraries on netobboks | - -Some class names may have endings like Aws or Azure(e.g. ComputationalResourceAws, ComputationalResourceAzure, etc...). It means that it's cloud specific class with a proper API - -#### Security service - -Security service is REST based service for user authentication against LDAP/LDAP + AWS/Azure OAuth2 depending on module configuration and cloud provider. -LDAP only provides with authentication end point that allows to verify authenticity of users against LDAP instance. -If you use AWS cloud provider LDAP + AWS authentication could be useful as it allows to combine LDAP authentication and verification if user has any role in AWS account - -DLab provides OAuth2(client credentials and authorization code flow) security authorization mechanism for Azure users. This kind of authentication is required when you are going to use Data Lake. If Data Lake is not enabled you have two options LDAP or OAuth2 -If OAuth2 is in use security-service validates user's permissions to configured permission scope(resource in Azure). -If Data Lake is enabled default permission scope(can be configured manually after deploy DLab) is Data Lake Store account so only if user has any role in scope of Data Lake Store Account resource he/she will be allowed to log in -If Data Lake is disabled but Azure OAuth2 is in use default permission scope will be Resource Group where DLab is created and only users who have any roles in the resource group will be allowed to log in. - - -## Front-end - -### Front-end components description - -Web UI sources are part of Self-Service. - -Sources are located in dlab/services/self-service/src/main/resources/webapp - -| Main pages | Components and Services | -|-------------------------------|-------------------------| -| Login page | LoginComponent
*applicationSecurityService* handles http calls and stores authentication tokens on the client and attaches the token to authenticated calls;
*healthStatusService* and *appRoutingService* check instances states and redirect to appropriate page. | -| Home page (list of resources) | HomeComponent
nested several main components like ResourcesGrid for notebooks data rendering and filtering, using custom MultiSelectDropdown component;
multiple modal dialogs components used for new instances creation, displaying detailed info and actions confirmation. | -| Health Status page | HealthStatusComponent
*HealthStatusGridComponent* displays list of instances, their types, statutes, ID’s and uses *healthStatusService* for handling main actions. | -| Help pages | Static pages that contains information and instructions on how to access Notebook Server and generate SSH key pair. Includes only *NavbarComponent*. | -| Error page | Simple static page letting users know that opened page does not exist. Includes only *NavbarComponent*. | -| Reporting page | ReportingComponent
ReportingGridComponent displays billing detailed info with built-in filtering and DateRangePicker component for custom range filtering;
uses *BillingReportService* for handling main actions and exports report data to .csv file. | - -## How to setup local development environment - -The development environment setup description is written with assumption that user already has installed Java8 (JDK), Maven3 and set environment variables (JAVA\_HOME, M2\_HOME).­­­­­­ The description will cover Mongo installation, Mongo user creation, filling initial data into Mongo, Node.js installation - -### Install Mongo database - - * Download MongoDB from [https://www.mongodb.com/download-center](https://www.mongodb.com/download-center) - * Install database based on MongoDB instructions - * Start DB server and create accounts -``` -use admin -db.createUser( - { - user: "admin", - pwd: "", - roles: [ { role: "dbAdminAnyDatabase", db: "admin" }, - { role: "userAdminAnyDatabase", db: "admin" }, - { role: "readWriteAnyDatabase", db: "admin" } ] - } -) -use -db.createUser( - { - user: "admin", - pwd: "", - roles: [ "dbAdmin", "userAdmin", "readWrite" ] - } -) -``` - - * Load collections form file dlab/services/settings/(aws|azure)/mongo_settings.json - -``` -mongoimport -u admin -p -d -c settings mongo_settings.json -``` - - * Load collections form file dlab/infrastructure-provisioning/src/ssn/files/mongo_roles.json - -``` -mongoimport -u admin -p -d --jsonArray -c roles mongo_roles.json -``` - -### Setting up environment options - - * Set option CLOUD_TYPE to aws/azure, DEV\_MODE to **true**, mongo database name and password in configuration file dlab/infrastructure-provisioning/src/ssn/templates/ssn.yml - -``` -<#assign CLOUD_TYPE="aws"> -... -<#assign DEV_MODE="true"> -... -mongo: - database: - password: -``` - - * Add system environment variable DLAB\_CONF\_DIR=<dlab\_root\_folder>/dlab/infrastructure-provisioning/src/ssn/templates/ssn.yml or create two symlinks in dlab/services/provisioning-service and dlab/services/self-service folders for file dlab/infrastructure-provisioning/src/ssn/templates/ssn.yml. - -*Unix* - -``` -ln -s ../../infrastructure-provisioning/src/ssn/templates/ssn.yml ssn.yml -``` - -*Windows* - -``` -mklink ssn.yml ..\\..\\infrastructure-provisioning\\src\\ssn\\templates\\ssn.yml -``` - - * For Unix system create two folders and grant permission for writing: - -``` -/var/opt/dlab/log/ssn -/opt/dlab/tmp/result -``` - -### Install Node.js - - * Download Node.js from [https://nodejs.org/en](https://nodejs.org/en) - * Install Node.js - * Make sure that the installation folder of Node.js has been added to the system environment variable **PATH** - * Install latest packages - -``` -npm install npm@latest -g -``` - -### Build Web UI components - - * Change folder to dlab/services/self-service/src/main/resources/webapp and install the dependencies from a package.json manifest - -``` -npm install -``` - * Replace CLOUD_PROVIDER options with aws|azure in dictionary file
dlab/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts - -``` -import { NAMING_CONVENTION } from './(aws|azure).dictionary'; - -export * from './(aws|azure).dictionary'; -``` - * Build web application - -``` -npm run build.prod -``` - -### Prepare HTTPS prerequisites - -To enable a SSL connection the web server should have a Digital Certificate. -To create a server certificate, follow these steps: - - * Create the keystore. - - * Export the certificate from the keystore. - - * Sign the certificate. - - * Import the certificate into a truststore: a repository of certificates used for verifying the certificates. A truststore typically contains more than one certificate. - -Please find below set of commands to create certificate, depending on OS. - -#### Create Unix/Ubuntu server certificate - -Pay attention that the last command has to be executed with administrative permissions. -``` -keytool -genkeypair -alias dlab -keyalg RSA -storepass KEYSTORE_PASSWORD -keypass KEYSTORE_PASSWORD -keystore ~/keys/dlab.keystore.jks -keysize 2048 -dname "CN=localhost" -keytool -exportcert -alias dlab -storepass KEYSTORE_PASSWORD -file ~/keys/dlab.crt -keystore ~/keys/dlab.keystore.jks -sudo keytool -importcert -trustcacerts -alias dlab -file ~/keys/dlab.crt -noprompt -storepass changeit -keystore ${JRE_HOME}/lib/security/cacerts -``` -#### Create Windows server certificate - -Pay attention that the last command has to be executed with administrative permissions. -To achieve this the command line (cmd) should be ran with administrative permissions. -``` -"%JRE_HOME%\bin\keytool" -genkeypair -alias dlab -keyalg RSA -storepass KEYSTORE_PASSWORD -keypass KEYSTORE_PASSWORD -keystore :\home\%USERNAME%\keys\dlab.keystore.jks -keysize 2048 -dname "CN=localhost" -"%JRE_HOME%\bin\keytool" -exportcert -alias dlab -storepass KEYSTORE_PASSWORD -file :\home\%USERNAME%\keys\dlab.crt -keystore :\home\%USERNAME%\keys\dlab.keystore.jks -"%JRE_HOME%\bin\keytool" -importcert -trustcacerts -alias dlab -file :\home\%USERNAME%\keys\dlab.crt -noprompt -storepass changeit -keystore "%JRE_HOME%\lib\security\cacerts" - -Useful command -"%JRE_HOME%\bin\keytool" -list -alias dlab -storepass changeit -keystore "%JRE_HOME%\lib\security\cacerts" -"%JRE_HOME%\bin\keytool" -delete -alias dlab -storepass changeit -keystore "%JRE_HOME%\lib\security\cacerts" -``` -Where the `````` must be the drive letter where you run the DLab. - - -## How to run locally - -There is a possibility to run Self-Service and Provisioning Service locally. All requests from Provisioning Service to Docker are mocked and instance creation status will be persisted to Mongo (only without real impact on Docker and AWS). Security Service can\`t be running on local machine because of local LDAP mocking complexity. - -Both services, Self-Service and Provisioning Service are dependent on dlab/provisioning-infrastructure/ssn/templates/ssn.yml configuration file. Both services have main functions as entry point, SelfServiceApplication for Self-Service and ProvisioningServiceApplication for Provisioning Service. Services could be started by running main methods of these classes. Both main functions require two arguments: - - * Run mode (“server”) - * Configuration file name (“self-service.yml” or “provisioning.yml” depending on the service). Both files are located in root service directory. These configuration files contain service settings and are ready to use. - -The services start up order does matter. Since Self-Service depends on Provisioning Service, the last should be started first and Self-Service afterwards. Services could be started from local IDEA (Eclipse or Intellij Idea) “Run” functionality of toolbox. - -Run application flow is following: - - * Run provisioning-service passing 2 arguments: server, provisioning.yml - * Run self-service passing 2 arguments: server, self-service.yml - * Try to access self-service Web UI by https://localhost:8443 - -``` -User: test -Password: -``` - -## Infrastructure provisioning - -### DevOps components overview - -The following list shows common structure of scripts for deploying DLab - -#### Folder structure - - dlab - └───infrastructure-provisioning - └───src - ├───base - ├───dataengine - ├───dataengine-service - ├───deeplearning - ├───edge - ├───general - ├───jupyter - ├───rstudio - ├───ssn - ├───tensor - └───zeppelin - -Each directory except *general* contains Python scripts, Docker files, templates, files for appropriate Docker image. - -- base – Main Docker image. It is a common/base image for other ones. -- edge – Docker image for Edge node. -- dataengine – Docker image for dataengine cluster. -- dataengine-service – Docker image for dataengine-service cluster. -- general – OS and CLOUD dependent common source. -- ssn – Docker image for Self-Service node (SSN). -- jupyter/rstudio/zeppelin/tensor/deeplearning – Docker images for Notebook nodes. - -All Python scripts, Docker files and other files, which are located in these directories, are OS and CLOUD independent. - -OS, CLOUD dependent and common for few templates scripts, functions, files are located in general directory. - - general - ├───api – all available API - ├───conf – DLab configuration - ├───files – OS/Cloud dependent files - ├───lib – OS/Cloud dependent functions - ├───scripts – OS/Cloud dependent Python scripts - └───templates – OS/Cloud dependent templates - -These directories may contain differentiation by operating system (Debian/RedHat) or cloud provider (AWS). - -Directories of templates (SSN, Edge etc.) contain only scripts, which are OS and CLOUD independent. - -If script/function is OS or CLOUD dependent, it should be located in appropriate directory/library in general folder. - -The following table describes mostly used scripts: - -| Script name/Path | Description | -|------------------------------|--------------------------------------------------------------------------------------------------| -| Dockerfile | Used for building Docker images and represents which Python scripts, templates and other files are needed. Required for each template. | -| base/entrypoint.py | This file is executed by Docker. It is responsible for setting environment variables, which are passed from Docker and for executing appropriate actions (script in general/api/). | -| base/scripts/\*.py | Scripts, which are OS independent and are used in each template. | -| general/api/\*.py | API scripts, which execute appropriate function from fabfile.py. | -| template\_name/fabfile.py | Is the main file for template and contains all functions, which can be used as template actions. | -| template\_name/scripts/\*.py | Python scripts, which are used for template. They are OS and CLOUD independent. | -| general/lib/aws/\*.py | Contains all functions related to AWS. | -| general/lib/os/ | This directory is divided by type of OS. All OS dependent functions are located here. | -| general/lib/os/fab.py | Contains OS independent functions used for multiple templates. | -| general/scripts/ | Directory is divided by type of Cloud provider and OS. | -| general/scripts/aws/\*.py | Scripts, which are executed from fabfiles and AWS-specific. The first part of file name defines to which template this script is related to. For example:
common\_\*.py – can be executed from more than one template.
ssn\_\*.py – are used for SSN template.
edge\_\*.py – are used for Edge template. | -| general/scripts/os/\*.py | Scripts, which are OS independent and can be executed from more than one template. | - -#### Docker actions overview - -Available Docker images and their actions: - -| Docker image | Actions | -|----------------------------------------------|-------------------------------------------------------------------------------| -| ssn | create, terminate | -| edge | create, terminate, status, start, stop, recreate | -| jupyter/rstudio/zeppelin/tensor/deeplearning | create, terminate, start, stop, configure, list_libs, install_libs, git_creds | -| dataengine/dataengine-service | create, terminate | - -##### Docker and python execution workflow on example of SSN node - -- Docker command for building images *docker.dlab-base* and *docker.dlab-ssn*: -``` -sudo docker build --build-arg OS=debian --file general/files/aws/base_Dockerfile -t docker.dlab-base . ; -sudo docker build --build-arg OS=debian --file general/files/aws/ssn_Dockerfile -t docker.dlab-ssn . ; -``` -Example of SSN Docker file: -``` -FROM docker.dlab-base:latest - -ARG OS - -COPY ssn/ /root/ -COPY general/scripts/aws/ssn_* /root/scripts/ -COPY general/lib/os/${OS}/ssn_lib.py /usr/lib/python2.7/dlab/ssn_lib.py -COPY general/files/aws/ssn_policy.json /root/files/ -COPY general/templates/aws/jenkins_jobs /root/templates/jenkins_jobs - -RUN chmod a+x /root/fabfile.py; \ - chmod a+x /root/scripts/* - -RUN mkdir /project_tree -COPY . /project_tree -``` -Using this Docker file, all required scripts and files will be copied to Docker container. - -- Docker command for building SSN: -``` -docker run -i -v /root/KEYNAME.pem:/root/keys/KEYNAME.pem –v /web_app:/root/web_app -e "conf_os_family=debian" -e "conf_cloud_provider=aws" -e "conf_resource=ssn" -e "aws_ssn_instance_size=t2.medium" -e "aws_region=us-west-2" -e "aws_vpc_id=vpc-111111" -e "aws_subnet_id=subnet-111111" -e "aws_security_groups_ids=sg-11111,sg-22222,sg-33333" -e "conf_key_name=KEYNAME" -e "conf_service_base_name=dlab_test" -e "aws_access_key=Access_Key_ID" -e "aws_secret_access_key=Secret_Access_Key" -e "conf_tag_resource_id=dlab" docker.dlab-ssn --action create ; -``` - -- Docker executes *entrypoint.py* script with action *create*. *Entrypoint.py* will set environment variables, which were provided from Docker and execute *general/api/create.py* script: -``` - elif args.action == 'create': - with hide('running'): - local("/bin/create.py") -``` -- *general/api/create.py* will execute Fabric command with *run* action: -``` - try: - local('cd /root; fab run') -``` -- Function *run()* in file *ssn/fabfile.py* will be executed. It will run two scripts *general/scripts/aws/ssn\_prepare.py* and *general/scripts/aws/ssn\_configure.py*: -``` - try: - local("~/scripts/{}.py".format('ssn_prepare')) - except Exception as err: - traceback.print_exc() - append_result("Failed preparing SSN node. Exception: " + str(err)) - sys.exit(1) - - try: - local("~/scripts/{}.py".format('ssn_configure')) - except Exception as err: - traceback.print_exc() - append_result("Failed configuring SSN node. Exception: " + str(err)) - sys.exit(1) -``` -- The scripts *general/scripts//ssn\_prepare.py* an *general/scripts//ssn\_configure.py* will execute other Python scripts/functions for: - 1. *ssn\_prepate.py:* - 1. Creating configuration file (for AWS) - 2. Creating Cloud resources. - 2. *ssn\_configure.py:* - 1. Installing prerequisites - 2. Installing required packages - 3. Configuring Docker - 4. Configuring DLab Web UI - -- If all scripts/function are executed successfully, Docker container will stop and SSN node will be created. - -#### Example of Docker commands - -SSN: - -``` -docker run -i -v .pem:/root/keys/.pem -e "region=" -e "conf_service_base_name=" -e “conf_resource=ssn" -e "aws_access_key=" -e "aws_secret_access_key=" docker.dlab-ssn --action -``` -All parameters are listed in section "Self-ServiceNode" chapter. - -Other images: -``` -docker run -i -v /home//keys:/root/keys -v /opt/dlab/tmp/result:/response -v /var/opt/dlab/log/:/logs/ -e –e docker.dlab- --action -``` - -#### How to add a new template - -First of all, a new directory should be created in *infrastructure-provisioning/src/*. - -For example: *infrastructure-provisioning/src/my-tool/* - -The following scripts/directories are required to be created in the template directory: - - my-tool - ├───scripts - └───fabfile.py - -fabfile.py – the main script, which contains main functions for this template such as run, stop, terminate, etc. - -Here is example of *run*() function for Jupyter Notebook node: - -Path: *infrastructure-provisioning/src/jupyter/fabfile.py* -``` -def run(): - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename - logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', - level=logging.DEBUG, - filename=local_log_filepath) - - notebook_config = dict() - notebook_config['uuid'] = str(uuid.uuid4())[:5] - - try: - params = "--uuid {}".format(notebook_config['uuid']) - local("~/scripts/{}.py {}".format('common_prepare_notebook', params)) - except Exception as err: - traceback.print_exc() - append_result("Failed preparing Notebook node.", str(err)) - sys.exit(1) - - try: - params = "--uuid {}".format(notebook_config['uuid']) - local("~/scripts/{}.py {}".format('jupyter_configure', params)) - except Exception as err: - traceback.print_exc() - append_result("Failed configuring Notebook node.", str(err)) - sys.exit(1) -``` - -This function describes process of creating Jupyter node. It is divided into two parts – prepare and configure. Prepare part is common for all notebook templates and responsible for creating of necessary cloud resources, such as EC2 instances, etc. Configure part describes how the appropriate services will be installed. - -To configure Jupyter node, the script *jupyter\_configure.py* is executed. This script describes steps for configuring Jupyter node. In each step, the appropriate Python script is executed. - -For example: - -Path: *infrastructure-provisioning/src/general/scripts/aws/jupyter\_configure.py* -``` - try: - logging.info('[CONFIGURE JUPYTER NOTEBOOK INSTANCE]') - print('[CONFIGURE JUPYTER NOTEBOOK INSTANCE]') - params = "--hostname {} --keyfile {} --region {} --spark_version {} --hadoop_version {} --os_user {} --scala_version {}".\ - format(instance_hostname, keyfile_name, os.environ['aws_region'], os.environ['notebook_spark_version'], - os.environ['notebook_hadoop_version'], os.environ['conf_os_user'], - os.environ['notebook_scala_version']) - try: - local("~/scripts/{}.py {}".format('configure_jupyter_node', params)) -``` - -In this step, the script *infrastructure-provisioning/src/jupyter/scripts/configure\_jupyter\_node.py* will be executed. - -Example of script *infrastructure-provisioning/src/jupyter/scripts/configure\_jupyter\_node.py:* -``` -if __name__ == "__main__": - print("Configure connections") - env['connection_attempts'] = 100 - env.key_filename = [args.keyfile] - env.host_string = args.os_user + '@' + args.hostname - - print("Configuring notebook server.") - try: - if not exists('/home/' + args.os_user + '/.ensure_dir'): - sudo('mkdir /home/' + args.os_user + '/.ensure_dir') - except: - sys.exit(1) - - print("Mount additional volume") - prepare_disk(args.os_user) - - print("Install Java") - ensure_jre_jdk(args.os_user) -``` - -This script call functions for configuring Jupyter node. If this function is OS dependent, it will be placed in *infrastructure-provisioning/src/general/lib/\/debian/notebook\_lib.py* - -All functions in template directory (e.g. *infrastructure-provisioning/src/my-tool/*) should be OS and cloud independent. - -All OS or cloud dependent functions should be placed in *infrastructure-provisioning/src/general/lib/* directory. - -The following steps are required for each Notebook node: - -- Configure proxy on Notebook instance – the script *infrastructure-provisioning/src/general/scripts/os/notebook\_configure\_proxy.py* -- Installing user’s key – the script *infrastructure-provisioning/src/base/scripts/install\_user\_key.py* - -Other scripts, responsible for configuring Jupyter node are placed in *infrastructure-provisioning/src/jupyter/scripts/* - -- scripts directory – contains all required configuration scripts. - - -- *infrastructure-provisioning/src/general/files//my-tool_Dockerfile* – used for building template Docker image and describes which files, scripts, templates are required and will be copied to template Docker image. -- *infrastructure-provisioning/src/general/files//my-tool_descriptsion.json* – JSON file for DLab Web UI. In this file you can specify: - * exploratory\_environment\_shapes – list of EC2 shapes - * exploratory\_environment\_versions – description of template - -Example of this file for Jupyter node for AWS cloud: -``` -{ - "exploratory_environment_shapes" : - { - "For testing" : [ - {"Size": "S", "Description": "Standard_DS1_v2", "Type": "Standard_DS1_v2","Ram": "3.5 GB","Cpu": "1", "Spot": "true", "SpotPctPrice": "70"} - ], - "Memory optimized" : [ - {"Size": "S", "Description": "Standard_E4s_v3", "Type": "Standard_E4s_v3","Ram": "32 GB","Cpu": "4"}, - {"Size": "M", "Description": "Standard_E16s_v3", "Type": "Standard_E16s_v3","Ram": "128 GB","Cpu": "16"}, - {"Size": "L", "Description": "Standard_E32s_v3", "Type": "Standard_E32s_v3","Ram": "256 GB","Cpu": "32"} - ], - "Compute optimized": [ - {"Size": "S", "Description": "Standard_F2s", "Type": "Standard_F2s","Ram": "4 GB","Cpu": "2"}, - {"Size": "M", "Description": "Standard_F8s", "Type": "Standard_F8s","Ram": "16.0 GB","Cpu": "8"}, - {"Size": "L", "Description": "Standard_F16s", "Type": "Standard_F16s","Ram": "32.0 GB","Cpu": "16"} - ] - }, - "exploratory_environment_versions" : - [ - { - "template_name": "Jupyter notebook 5.7.4", - "description": "Base image with jupyter node creation routines", - "environment_type": "exploratory", - "version": "jupyter_notebook-5.7.4", - "vendor": "Azure" - } - ] -} -``` - -Additionally, following directories could be created: - -- templates – directory for new templates; - -- files – directory for files used by newly added templates only; - -All Docker images are being built while creating SSN node. To add newly created template, add it to the list of images in the -following script: - -Path: *infrastructure-provisioning/src/general/scripts/aws/ssn\_configure.py* -``` - try: - logging.info('[CONFIGURING DOCKER AT SSN INSTANCE]') - print('[CONFIGURING DOCKER AT SSN INSTANCE]') - additional_config = [{"name": "base", "tag": "latest"}, - {"name": "edge", "tag": "latest"}, - {"name": "jupyter", "tag": "latest"}, - {"name": "rstudio", "tag": "latest"}, - {"name": "zeppelin", "tag": "latest"}, - {"name": "tensor", "tag": "latest"}, - {"name": "emr", "tag": "latest"}] -``` -For example: -``` -... - - {"name": "my-tool", "tag": "latest"}, - -... -``` - -## LDAP Authentication - -### Unified logging and group management - -There are a few popular LDAP distributions on the market like Active Directory, Open LDap. That’s why some differences in configuration appear. -Also depending on customization, there might be differences in attributes configuration. For example the DN(distinguished name) may contain different attributes: - -- **DN=CN=Name Surname,OU=groups,OU=EPAM,DC=Company,DC=Cloud** -- **DN=UID=UID#53,OU=groups,OU=Company,DC=Company,DC=Cloud** - -**CN** vs **UID**. - -The relation between users and groups also varies from vendor to vendor. - -For example, in Open LDAP the group object may contain set (from 0 to many) attributes **"memberuid"** with values equal to user`s attribute **“uid”**. - -However, in Active Directory the mappings are done based on other attributes. -On a group size there is attribute **"member"** (from 0 to many values) and its value is user`s **DN** (distinguished name). - - -To fit the unified way of LDAP usage, we introduced configuration file with set of properties and customized scripts (python and JavaScript based). -On backend side, all valuable attributes are further collected and passed to these scripts. -To apply some customization it is required to update a few properties in **security.yml** and customize the scripts. - - -### Properties overview - -There are just a few properties based in which the customization could be done: -- **ldapBindTemplate: uid=%s,ou=People,dc=example,dc=com** -- **ldapBindAttribute: uid** -- **ldapSearchAttribute: uid** - -Where the: -- **ldapBindTemplate** is a user`s DN template which should be filed with custom value. Here the template could be changed: uid=%s,ou=People,dc=example,dc=com -> cn=%s,ou=People,dc=example,dc=com. -- **ldapBindAttribute** - this is a major attribute, on which the DN is based on. Usually it is any of: uid or cn, or email. -- **ldapSearchAttribute** - another attribute, based on which users will be looked up in LDAP. - -Additional parameters that are populated during deployment and may be changed in future are: -- **ldapConnectionConfig.name: ldap user name** -- **ldapConnectionConfig.ldapHost: ldap host** -- **ldapConnectionConfig.ldapPort: ldap port** -- **ldapConnectionConfig.credentials: ldap credentials** - -### Scripts overview - -There are 3 scripts in security.yml: -- **userLookUp** (python based) - responsible for user lookup in LDap and returns additional user`s attributes; -- **userInfo** (python based) - enriches user with additional data; -- **groupInfo** (javascript based) – responsible for mapping between users and groups; - -### Script structure - -The scripts above were created to flexibly manage user`s security configuration. They all are part of **security.yml** configuration. All scripts have following structure: - - **name** - - **cache** - - **expirationTimeMsec** - - **scope** - - **attributes** - - **timeLimit** - - **base** - - **filter** - - **searchResultProcessor:** - - **language** - - **code** - -Major properties are: -- **attributes** - list of attributes that will be retrieved from LDAP (-name, -cn, -uid, -member, etc); -- **filter** - the filter, based on which the object will be retrieved from LDAP; -- **searchResultProcessor** - optional. If only LDAP object attributes retrieving is required, this property should be empty. For example, “userLookup” script only retrieves list of "attributes". Otherwise, code customization (like user enrichment, user to groups matching, etc.) should be added into sub-properties below: - - **language** - the script language - "python" or "JavaScript" - - **code** - the script code. - - -### "userLookUp" script - -Configuration properties: - -- **ldapBindTemplate: 'cn=%s,ou=users,ou=alxn,dc=alexion,dc=cloud'** -- **ldapBindAttribute: cn** -- **ldapSearchAttribute: mail** - -Script code: - - name: userLookUp - cache: true - expirationTimeMsec: 600000 - scope: SUBTREE - attributes: - - cn - - gidNumber - - mail - - memberOf - timeLimit: 0 - base: ou=users,ou=alxn,dc=alexion,dc=cloud - filter: "(&(objectCategory=person)(objectClass=user)(mail=%mail%))" - -In the example above, the user login passed from GUI is a mail (**ldapSearchAttribute: mail**) and based on the filer (**filter: "(&(objectCategory=person)(objectClass=user)(mail=%mail%))")** so, the service would search user by its **“mail”**. -If corresponding users are found - the script will return additional user`s attributes: - - cn - - gidNumber - - mail - - memberOf - -User`s authentication into LDAP would be done for DN with following template **ldapBindTemplate: 'cn=%s,ou=users,ou=alxn,dc=alexion,dc=cloud'**, where CN is attribute retrieved by **“userLookUp”** script. - -## Azure OAuth2 Authentication -DLab supports OAuth2 authentication that is configured automatically in Security Service and Self Service after DLab deployment. -Please see explanation details about configuration parameters for Self Service and Security Service below. -DLab supports client credentials(username + password) and authorization code flow for authentication. - - -### Azure OAuth2 Self Service configuration - - azureLoginConfiguration: - useLdap: false - tenant: xxxx-xxxx-xxxx-xxxx - authority: https://login.microsoftonline.com/ - clientId: xxxx-xxxx-xxxx-xxxx - redirectUrl: https://dlab.azure.cloudapp.azure.com/ - responseMode: query - prompt: consent - silent: true - loginPage: https://dlab.azure.cloudapp.azure.com/ - maxSessionDurabilityMilliseconds: 288000000 - -where: -- **useLdap** - defines if LDAP authentication is enabled(true/false). If false Azure OAuth2 takes place with configuration properties below -- **tenant** - tenant id of your company -- **authority** - Microsoft login endpoint -- **clientId** - id of the application that users log in through -- **redirectUrl** - redirect URL to DLab application after try to login to Azure using OAuth2 -- **responseMode** - defines how Azure sends authorization code or error information to DLab during log in procedure -- **prompt** - defines kind of prompt during Oauth2 login -- **silent** - defines if DLab tries to log in user without interaction(true/false), if false DLab tries to login user with configured prompt -- **loginPage** - start page of DLab application -- **maxSessionDurabilityMilliseconds** - max user session durability. user will be asked to login after this period of time and when he/she creates ot starts notebook/cluster. This operation is needed to update refresh_token that is used by notebooks to access Data Lake Store - -To get more info about *responseMode*, *prompt* parameters please visit [Authorize access to web applications using OAuth 2.0 and Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-protocols-oauth-code) - - -### Azure OAuth2 Security Service configuration - - azureLoginConfiguration: - useLdap: false - tenant: xxxx-xxxx-xxxx-xxxx - authority: https://login.microsoftonline.com/ - clientId: xxxx-xxxx-xxxx-xxxx - redirectUrl: https://dlab.azure.cloudapp.azure.com/ - validatePermissionScope: true - permissionScope: subscriptions/xxxx-xxxx-xxxx-xxxx/resourceGroups/xxxx-xxxx/providers/Microsoft.DataLakeStore/accounts/xxxx/providers/Microsoft.Authorization/ - managementApiAuthFile: /dlab/keys/azure_authentication.json - -where: -- **useLdap** - defines if LDAP authentication is enabled(true/false). If false Azure OAuth2 takes place with configuration properties below -- **tenant** - tenant id of your company -- **authority** - Microsoft login endpoint -- **clientId** - id of the application that users log in through -- **redirectUrl** - redirect URL to DLab application after try to login to Azure using OAuth2 -- **validatePermissionScope** - defines(true/false) if user's permissions should be validated to resource that is provided in permissionScope parameter. User will be logged in onlu in case he/she has any role in resource IAM described with permissionScope parameter -- **permissionScope** - describes Azure resource where user should have any role to pass authentication. If user has no role in resource IAM he/she will not be logged in -- **managementApiAuthFile** - authentication file that is used to query Microsoft Graph API to check user roles in resource described in permissionScope - From d0b5247c6b0665255bbc01e35cbcd0dd243f3191 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 12:34:28 +0300 Subject: [PATCH 242/357] aws - edge stop/start/status Docker file returned --- .../src/general/files/aws/edge_Dockerfile | 34 +++++++++++++++++++ .../general/files/aws/edge_description.json | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 infrastructure-provisioning/src/general/files/aws/edge_Dockerfile create mode 100644 infrastructure-provisioning/src/general/files/aws/edge_description.json diff --git a/infrastructure-provisioning/src/general/files/aws/edge_Dockerfile b/infrastructure-provisioning/src/general/files/aws/edge_Dockerfile new file mode 100644 index 0000000000..143eee6029 --- /dev/null +++ b/infrastructure-provisioning/src/general/files/aws/edge_Dockerfile @@ -0,0 +1,34 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + + +FROM docker.dlab-base:latest + +ARG OS + +COPY edge/ /root/ +COPY general/scripts/aws/edge_* /root/scripts/ +COPY general/lib/os/${OS}/edge_lib.py /usr/lib/python2.7/dlab/edge_lib.py +COPY general/templates/aws/edge_s3_policy.json /root/templates/edge_s3_policy.json + +RUN chmod a+x /root/fabfile.py; \ + chmod a+x /root/scripts/* + diff --git a/infrastructure-provisioning/src/general/files/aws/edge_description.json b/infrastructure-provisioning/src/general/files/aws/edge_description.json new file mode 100644 index 0000000000..d209f728f3 --- /dev/null +++ b/infrastructure-provisioning/src/general/files/aws/edge_description.json @@ -0,0 +1,4 @@ +{ + "template_name": "Edge node service.", + "description": "Edge node start/stop/status." +} \ No newline at end of file From 3653ab318a35d4e1a9feba671373e277623ff72d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 2 Jul 2019 15:09:16 +0300 Subject: [PATCH 243/357] [DLAB-827]: unify scrollers --- .../app/shared/navbar/navbar.component.html | 2 +- .../src/main/resources/webapp/src/styles.scss | 47 ++++++++++++++++--- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index c5a424f687..ceb18f0192 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -101,7 +101,7 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index bffb5bdb76..ed72357ed2 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -47,10 +47,12 @@ background-color: rgba(53, 175, 213, 0.11) !important; color: #577289; } + .mat-tab-header-pagination.mat-tab-header-pagination-after, .mat-tab-header-pagination.mat-tab-header-pagination-before { display: none !important; } + .mat-drawer-container { height: calc(100% - 48px); } @@ -61,6 +63,7 @@ mat-chip.mat-chip { font-size: 14px; padding: 8px 18px; } + mat-chip.mat-chip a { display: inline-block; width: 12px; @@ -89,10 +92,12 @@ mat-chip.mat-chip strong { margin-right: 15px; float: right; } + .rotate { -webkit-animation: spin 2s linear infinite; animation: spin 2s linear infinite; } + .status { text-transform: capitalize; } @@ -127,6 +132,7 @@ mat-chip.mat-chip strong { color: #f1696e; font-size: 12px; } + .not-allowed { cursor: not-allowed !important; user-select: none; @@ -143,6 +149,7 @@ mat-chip.mat-chip strong { padding: 40px 20px; text-align: center; } + .info { font-size: 15px; font-weight: 300; @@ -167,6 +174,7 @@ mat-chip.mat-chip strong { 0% { -webkit-transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); } @@ -176,6 +184,7 @@ mat-chip.mat-chip strong { 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } @@ -235,10 +244,12 @@ mat-chip.mat-chip strong { } /* IE can just show/hide with no transition */ -@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { +@media all and (-ms-high-contrast: none), +(-ms-high-contrast: active) { .tooltip-wrap .tooltip { display: none; } + .tooltip-wrap:hover .tooltip { display: block; } @@ -259,32 +270,43 @@ input[type='number'] { .text-center { text-align: center !important; } + .text-right { text-align: right; } + .m-top-10 { margin-top: 10px; } + .m-top-15 { margin-top: 15px; } + .m-top-20 { margin-top: 20px; } + .m-top-30 { margin-top: 30px; } + .m-bott-10 { margin-bottom: 10px; } + .m-top-10p { margin-top: 10%; } -.ml-10 { margin-left: 10px; } + +.ml-10 { + margin-left: 10px; +} .full-height { height: 100%; } + .ani { transition: all .35s ease-in-out; } @@ -295,6 +317,7 @@ input[type='number'] { align-items: center; justify-content: center; height: 100%; + .content { text-align: center; } @@ -302,7 +325,8 @@ input[type='number'] { #scrolling::-webkit-scrollbar, .list-selected mat-chip-list .mat-chip-list-wrapper::-webkit-scrollbar { - width: 6px; + width: 5px; + height: 5px; } #scrolling::-webkit-scrollbar-track, @@ -327,6 +351,7 @@ input[type='number'] { color: #fff; background: #e2747d; word-break: break-word; + span { position: absolute; top: -12px; @@ -346,20 +371,22 @@ input[type='number'] { white-space: nowrap; overflow: hidden; } + .capitalize { text-transform: capitalize; } .overlay-container { #toast-container { - > div.toast { - box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12); + >div.toast { + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12); border-radius: 2px; background-color: #fff; padding: 12px 20px; overflow: inherit; margin: 0 0 15px; font-size: 14px; + &::before { position: absolute; left: -15px; @@ -371,32 +398,40 @@ input[type='number'] { padding: 7px; box-sizing: border-box; border-radius: 50%; - box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12); + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12); } + &.toast-success { background-image: none; color: #49af38; + &::before { content: "done"; } } + &.toast-error { background-image: none; color: #e2747d; + &::before { content: "priority_high"; } } + &.toast-info { background-image: none; color: #35afd5; + &::before { content: "priority_high"; } } + &.toast-warning { background-image: none; color: #f7b500; + &::before { content: "priority_high"; } From 8bc44db4d8f8416bc8c460a180a3a2ae808e73e8 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 15:35:37 +0300 Subject: [PATCH 244/357] README.md deleted by mistake fixede --- README.md | 2539 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2539 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000000..88d49dee67 --- /dev/null +++ b/README.md @@ -0,0 +1,2539 @@ +DLAB Overview +============= + +------- +CONTENTS +------- + +[What is DLAB?](#What_is_DLAB) + +    [How to Contribute](CONTRIBUTING.md) + +[Logical architecture](#Logical_architecture) + +[Physical architecture](#Physical_architecture) + +[DLab Deployment](#DLab_Deployment) + +        [Prerequisites](#Prerequisites) + +        [Preparing environment for DLab deployment](#Env_for_DLab) + +        [Structure of main DLab directory](#DLab_directory) + +        [Structure of log directory](#log_directory) + +        [Self-Service Node](#Self_Service_Node) + +        [Edge Node](#Edge_Node) + +        [Notebook node](#Notebook_node) + +        [EMR cluster](#EMR_cluster) + +        [Configuration files](#Configuration_files) + +        [Starting/Stopping services](#Starting_Stopping_services) + +        [Billing report](#Billing_Report) + +        [Backup and Restore](#Backup_and_Restore) + +        [GitLab server](#GitLab_server) + +        [Troubleshooting](#Troubleshooting) + +[Development](#Development) + +        [Folder structure](#Folder_structure) + +        [Pre-requisites](#Pre-requisites) + +        [Java back-end services](#Java_back_end_services) + +        [Front-end](#Front_end) + +        [How to setup local development environment](#setup_local_environment) + +        [How to run locally](#run_locally) + +        [Infrastructure provisioning](#Infrastructure_provisioning) + +        [LDAP Authentication](#LDAP_Authentication) + +        [Azure OAuth2 Authentication](#Azure_OAuth2_Authentication) + +--------------- +# What is DLAB? + +DLab is an essential toolset for analytics. It is a self-service Web Console, used to create and manage exploratory environments. It allows teams to spin up analytical environments with best of breed open-source tools just with a single click of the mouse. Once established, environment can be managed by an analytical team itself, leveraging simple and easy-to-use Web Interface. +

See more at dlab.opensource.epam.com.

+ +---------------------------- +# Logical architecture + +The following diagram demonstrate high-level logical architecture. + +![Logical architecture](doc/logical_architecture.png) + +The diagram shows main components of DLab, which is a self-service for the infrastructure deployment and interaction with it. The purpose of each component is described below. + +## Self-Service + +Self-Service is a service, which provides RESTful user API with Web User Interface for data scientist. It tightly interacts with Provisioning Service and Database. Self-Service delegates all user\`s requests to Provisioning Service. After execution of certain request from Self-service, Provisioning Service returns response about corresponding action happened with particular resource. Self-service, then, saves this response into Database. So, each time Self-Service receives request about status of provisioned infrastructure resources – it loads it from Database and propagates to Web UI. + +## Billing + +Billing is a module, which provides a loading of the billing report for the environment to the database. It can be running as part of the Self-Service or a separate process. + +## Provisioning Service + +The Provisioning Service is a RESTful service, which provides APIs for provisioning of the user’s infrastructure. Provisioning Service receives the request from Self-Service, afterwards it forms and sends a command to the docker to execute requested action. Docker executes the command and generates a response.json file. Provisioning service analyzes response.json and responds to initial request of Self-Service, providing status-related information of the instance. + +## Security service + +Security Service is RESTful service, which provides authorization API for Self-Service and Provisioning Service via LDAP. + +## Docker + +Docker is an infrastructure-provisioning module based on Docker service, which provides low-level actions for infrastructure management. + +## Database + +Database serves as a storage with description of user infrastructure, user’s settings and service information. + +----------------------------- +# Physical architecture + +The following diagrams demonstrate high-level physical architecture of DLab in AWS and Azure. + +![Physical architecture](doc/physical_architecture.png) + +![Physical architecture](doc/azure_dlab_arch.png) + +## Main components + +- Self-service node (SSN) +- Edge node +- Notebook node (Jupyter, Rstudio, etc.) +- Data engine cluster +- Data engine cluster as a service provided with Cloud + +## Self-service node (SSN) + +Creation of self-service node – is the first step for deploying DLab. SSN is a main server with following pre-installed services: + +- DLab Web UI – is Web user interface for managing/deploying all components of DLab. It is accessible by the following URL: http[s]://SSN\_Public\_IP\_or\_Public\_DNS +- MongoDB – is a database, which contains part of DLab’s configuration, user’s exploratory environments description as well as user’s preferences. +- Docker – used for building DLab Docker containers, which will be used for provisioning other components. +- Jenkins – is an alternative to Web UI. It is accessible by the following link: http[s]://SSN\_Public\_IP\_or\_Public\_DNS/jenkins + +Elastic(Static) IP address is assigned to an SSN Node, so you are free to stop|start it and and SSN node's IP address won’t change. + +## Edge node + +Setting up Edge node is the first step that user is asked to do once logged into DLab. This node is used as proxy server and SSH gateway for the user. Through Edge node users can access Notebook via HTTP and SSH. Edge Node has a Squid HTTP web proxy pre-installed. + +## Notebook node + +The next step is setting up a Notebook node (or a Notebook server). It is a server with pre-installed applications and libraries for data processing, data cleaning and transformations, numerical simulations, statistical modeling, machine learning, etc. Following analytical tools are currently supported in DLab and can be installed on a Notebook node: + +- Jupyter +- RStudio +- Apache Zeppelin +- TensorFlow + Jupyter +- Deep Learning + Jupyter + +Apache Spark is also installed for each of the analytical tools above. + +**Note:** terms 'Apache Zeppelin' and 'Apache Spark' hereinafter may be referred to as 'Zeppelin' and 'Spark' respectively or may have original reference. + +## Data engine cluster + +After deploying Notebook node, user can create one of the cluster for it: +- Data engine - Spark standalone cluster +- Data engine service - cloud managed cluster platform (EMR for AWS or Dataproc for GCP) +That simplifies running big data frameworks, such as Apache Hadoop and Apache Spark to process and analyze vast amounts of data. Adding cluster is not mandatory and is only needed in case additional computational resources are required for job execution. +---------------------- +# DLab Deployment + +## Prerequisites +#### In Amazon cloud +Prerequisites: + + - SSH key for EC2 instances. This key could be created through Amazon Console. + - IAM user + - AWS access key ID and secret access key + - The following permissions should be assigned for IAM user: + +``` +{ + "Version": "2012-10-17", + "Statement": [ + { + "Action": [ + "iam:ListRoles", + "iam:CreateRole", + "iam:CreateInstanceProfile", + "iam:PutRolePolicy", + "iam:AddRoleToInstanceProfile", + "iam:PassRole", + "iam:GetInstanceProfile", + "iam:ListInstanceProfilesForRole" + "iam:RemoveRoleFromInstanceProfile", + "iam:DeleteInstanceProfile", + "iam:TagRole" + ], + "Effect": "Allow", + "Resource": "*" + }, + { + "Action": [ + "ec2:DescribeImages", + "ec2:CreateTags", + "ec2:DescribeRouteTables", + "ec2:CreateRouteTable", + "ec2:AssociateRouteTable", + "ec2:DescribeVpcEndpoints", + "ec2:CreateVpcEndpoint", + "ec2:ModifyVpcEndpoint", + "ec2:DescribeInstances", + "ec2:RunInstances", + "ec2:DescribeAddresses", + "ec2:AllocateAddress", + "ec2:DescribeInstances", + "ec2:AssociateAddress", + "ec2:DisassociateAddress", + "ec2:ReleaseAddress", + "ec2:TerminateInstances" + ], + "Effect": "Allow", + "Resource": "*" + }, + { + "Action": [ + "s3:ListAllMyBuckets", + "s3:CreateBucket", + "s3:PutBucketTagging", + "s3:GetBucketTagging" + ], + "Effect": "Allow", + "Resource": "*" + } + ] +} +``` + +#### In Azure cloud + +Prerequisites: + +- IAM user with Contributor permissions. +- Service principal and JSON based auth file with clientId, clientSecret and tenantId. + +**Note:** The following permissions should be assigned to the service principal: + +- Windows Azure Active Directory +- Microsoft Graph +- Windows Azure Service Management API + +#### In Google cloud (GCP) + +Prerequisites: + +- IAM user +- Service account and JSON auth file for it. In order to get JSON auth file, Key should be created for service account through Google cloud console. +## Preparing environment for DLab deployment + +#### In Amazon cloud +If you want to deploy DLab from inside of your AWS account, you can use the following instruction: + +- Create an EC2 instance with the following settings: + - Shape of the instance shouldn't be less than t2.medium + - The instance should have access to Internet in order to install required prerequisites + - The instance should have access to further DLab installation + - AMI - Ubuntu 16.04 + - IAM role with [policy](#AWS_SSN_policy) should be assigned to the instance +- Connect to the instance via SSH and run the following commands: +``` + sudo su + apt-get update + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - + add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + apt-get update + apt-cache policy docker-ce + apt-get install -y docker-ce=17.06.2~ce-0~ubuntu + usermod -a -G docker ubuntu + pip install fabric==1.14.0 +``` +- Clone DLab repository and run deploy script. + +## Structure of main DLab directory + +DLab’s SSN node main directory structure is as follows: + + /opt + └───dlab + ├───conf + ├───sources + ├───template + ├───tmp + │ └───result + └───webapp + +- conf – contains configuration for DLab Web UI and back-end services; +- sources – contains all Docker/Python scripts, templates and files for provisioning; +- template – docker’s templates; +- tmp –temporary directory of DLab; +- tmp/result – temporary directory for Docker’s response files; +- webapp – contains all .jar files for DLab Web UI and back-end + services. + +## Structure of log directory + +SSN node structure of log directory is as follows: + + /var + └───opt + └───dlab + └───log + ├───dataengine + ├───dateengine-service + ├───edge + ├───notebook + └───ssn + +These directories contain the log files for each template and for DLab back-end services. +- ssn – contains logs of back-end services; +- provisioning.log – Provisioning Service log file; +- security.log – Security Service log file; +- selfservice.log – Self-Service log file; +- edge, notebook, dataengine, dataengine-service – contains logs of Python scripts. + +## Self-Service Node + +### Create + +Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. +For each cloud provider, prerequisites are different. + +#### In Amazon cloud + +To build SSN node, following steps should be executed: + +1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. +2. Go to *dlab* directory. +3. Execute following script: +``` +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXXXX --aws_region us-west-2 --conf_os_family debian --conf_cloud_provider aws --aws_vpc_id vpc-xxxxx --aws_subnet_id subnet-xxxxx --aws_security_groups_ids sg-xxxxx,sg-xxxx --key_path /root/ --conf_key_name Test --conf_tag_resource_id dlab --aws_account_id xxxxxxxx --aws_billing_bucket billing_bucket --aws_report_path /billing/directory/ --action create +``` + +This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. + +List of parameters for SSN node deployment: + +| Parameter | Description/Value | +|---------------------------|-----------------------------------------------------------------------------------------| +| conf\_service\_base\_name | Any infrastructure value (should be unique if multiple SSN’s have been deployed before) | +| aws\_access\_key | AWS user access key | +| aws\_secret\_access\_key | AWS user secret access key | +| aws\_region | AWS region | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (AWS) +| conf\_duo\_vpc\_enable | "true" - for installing DLab into two Virtual Private Clouds (VPCs) or "false" - for installing DLab into one VPC. Also this parameter isn't required when deploy DLab in one VPC +| aws\_vpc\_id | ID of the VPC | +| aws\_subnet\_id | ID of the public subnet | +| aws\_security\_groups\_ids| One or more ID\`s of AWS Security Groups, which will be assigned to SSN node | +| key\_path | Path to admin key (without key name) | +| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | +| conf\_tag\_resource\_id | The name of tag for billing reports | +| aws\_account\_id | The The ID of Amazon account | +| aws\_billing\_bucket | The name of S3 bucket where billing reports will be placed | +| aws\_report\_path | The path to billing reports directory in S3 bucket. This parameter isn't required when billing reports are placed in the root of S3 bucket. | +| action | In case of SSN node creation, this parameter should be set to “create” +| workspace\_path | Path to DLab sources root + +**Note:** If the following parameters are not specified, they will be created automatically: +- aws\_vpc\_id +- aws\_subnet\_id +- aws\_sg\_ids + +**Note:** If billing won't be using, the following parameters are not required: +- aws\_account\_id +- aws\_billing\_bucket +- aws\_report\_path + +After SSN node deployment following AWS resources will be created: + +- SSN EC2 instance +- Elastic IP for SSN instance +- IAM role and EC2 Instance Profile for SSN +- Security Group for SSN node (if it was specified, script will attach the provided one) +- VPC, Subnet (if they have not been specified) for SSN and EDGE nodes +- S3 bucket – its name will be \-ssn-bucket. This bucket will contain necessary dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) +- S3 bucket for for collaboration between Dlab users. Its name will be \-shared-bucket + +#### In Azure cloud + +To build SSN node, following steps should be executed: + +1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed +2. Go to *dlab* directory +3. To have working billing functionality please review Billing configuration note and use proper parameters for SSN node deployment +4. To use Data Lake Store please review Azure Data Lake usage pre-requisites note and use proper parameters for SSN node deployment +5. Execute following deploy_dlab.py script: +``` +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --azure_region westus2 --conf_os_family debian --conf_cloud_provider azure --azure_vpc_name vpc-test --azure_subnet_name subnet-test --azure_security_group_name sg-test1,sg-test2 --key_path /root/ --conf_key_name Test --azure_auth_path /dir/file.json --action create +``` + +This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. + +List of parameters for SSN node deployment: + +| Parameter | Description/Value | +|-----------------------------------|-----------------------------------------------------------------------------------------| +| conf\_service\_base\_name | Any infrastructure value (should be unique if multiple SSN’s have been deployed before) | +| azure\_resource\_group\_name | Resource group name (could be the same as service base name | +| azure\_region | Azure region | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (Azure) | +| azure\_vpc\_name | Name of the Virtual Network (VN) | +| azure\_subnet\_name | Name of the Azure subnet | +| azure\_security\_groups\_name | One or more Name\`s of Azure Security Groups, which will be assigned to SSN node | +| azure\_ssn\_instance\_size | Instance size of SSN instance in Azure | +| key\_path | Path to admin key (without key name) | +| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | +| azure\_auth\_path | Full path to auth json file | +| azure\_offer\_number | Azure offer id number | +| azure\_currency | Currency that is used for billing information(e.g. USD) | +| azure\_locale | Locale that is used for billing information(e.g. en-US) | +| azure\_region\_info | Region info that is used for billing information(e.g. US) | +| azure\_datalake\_enable | Support of Azure Data Lake (true/false) | +| azure\_oauth2\_enabled | Defines if Azure OAuth2 authentication mechanisms is enabled(true/false) | +| azure\_validate\_permission\_scope| Defines if DLab verifies user's permission to the configured resource(scope) during login with OAuth2 (true/false). If Data Lake is enabled default scope is Data Lake Store Account, else Resource Group, where DLab is deployed, is default scope. If user does not have any role in scope he/she is forbidden to log in +| azure\_application\_id | Azure application ID that is used to log in users in DLab | +| azure\_ad\_group\_id | ID of group in Active directory whose members have full access to shared folder in Azure Data Lake Store | +| action | In case of SSN node creation, this parameter should be set to “create” | + +**Note:** If the following parameters are not specified, they will be created automatically: +- azure\_vpc\_nam +- azure\_subnet\_name +- azure\_security\_groups\_name + +**Note:** Billing configuration: + +To know azure\_offer\_number open [Azure Portal](https://portal.azure.com), go to Subscriptions and open yours, then click Overview and you should see it under Offer ID property: + +![Azure offer number](doc/azure_offer_number.png) + +Please see [RateCard API](https://msdn.microsoft.com/en-us/library/mt219004.aspx) to get more details about azure\_offer\_number, +azure\_currency, azure\_locale, azure\_region_info. These DLab deploy properties correspond to RateCard API request parameters. + +**Note:** Azure Data Lake usage pre-requisites: + +1. Configure application in Azure portal and grant proper permissions to it. +- Open *Azure Active Directory* tab, then *App registrations* and click *New application registration* +- Fill in ui form with the following parameters *Name* - put name of the new application, *Application type* - select Native, *Sign-on URL* put any valid url as it will be updated later +- Grant proper permissions to the application. Select the application you just created on *App registration* view, then click *Required permissions*, then *Add->Select an API-> In search field type MicrosoftAzureQueryService* and press *Select*, then check the box *Have full access to the Azure Data Lake service* and save the changes. Repeat the same actions for *Windows Azure Active Directory* API (available on *Required permissions->Add->Select an API*) and the box *Sign in and read user profile* +- Get *Application ID* from application properties it will be used as azure_application_id for deploy_dlap.py script +2. Usage of Data Lake resource predicts shared folder where all users can write or read any data. To manage access to this folder please create ot use existing group in Active Directory. All users from this group will have RW access to the shared folder. Put ID(in Active Directory) of the group as *azure_ad_group_id* parameter to deploy_dlab.py script +3. After execution of deploy_dlab.py script go to the application created in step 1 and change *Redirect URIs* value to the https://SSN_HOSTNAME/ where SSN_HOSTNAME - SSN node hostname + +After SSN node deployment following Azure resources will be created: + +- Resource group where all DLAb resources will be provisioned +- SSN Virtual machine +- Static public IP address dor SSN virtual machine +- Network interface for SSN node +- Security Group for SSN node (if it was specified, script will attach the provided one) +- Virtual network and Subnet (if they have not been specified) for SSN and EDGE nodes +- Storage account and blob container for necessary further dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) +- Storage account and blob container for collaboration between Dlab users +- If support of Data Lake is enabled: Data Lake and shared directory will be created + +#### In Google cloud (GCP) + +To build SSN node, following steps should be executed: + +1. Clone Git repository and make sure that all following [pre-requisites](#Pre-requisites) are installed. +2. Go to *dlab* directory. +3. Execute following script: +``` +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab --gcp_region us-west1 --gcp_zone us-west1-a --conf_os_family debian --conf_cloud_provider gcp --key_path /key/path/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create +``` + +This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. + +List of parameters for SSN node deployment: + +| Parameter | Description/Value | +|------------------------------|-----------------------------------------------------------------------------------------| +| conf\_service\_base\_name | Any infrastructure value (should be unique if multiple SSN’s have been deployed before) | +| gcp\_region | GCP region | +| gcp\_zone | GCP zone | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (GCP) | +| gcp\_vpc\_name | Name of the Virtual Network (VN) | +| gcp\_subnet\_name | Name of the GCP subnet | +| gcp\_firewall\_name | One or more Name\`s of GCP Security Groups, which will be assigned to SSN node | +| key\_path | Path to admin key (without key name) | +| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | +| gcp\_service\_account\_path | Full path to auth json file | +| gcp\_ssn\_instance\_size | Instance size of SSN instance in GCP | +| gcp\_project\_id | ID of GCP project | +| action | In case of SSN node creation, this parameter should be set to “create” | + + +**Note:** If you gonna use Dataproc cluster, be aware that Dataproc has limited availability in GCP regions. [Cloud Dataproc availability by Region in GCP](https://cloud.google.com/about/locations/) + +After SSN node deployment following GCP resources will be created: + +- SSN VM instance +- External IP address for SSN instance +- IAM role and Service account for SSN +- Security Groups for SSN node (if it was specified, script will attach the provided one) +- VPC, Subnet (if they have not been specified) for SSN and EDGE nodes +- Bucket – its name will be \-ssn-bucket. This bucket will contain necessary dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) +- Bucket for for collaboration between Dlab users. Its name will be \-shared-bucket + +### Terminate + +Terminating SSN node will also remove all nodes and components related to it. Basically, terminating Self-service node will terminate all DLab’s infrastructure. +Example of command for terminating DLab environment: + +#### In Amazon +``` +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXX --aws_region us-west-2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider aws --action terminate +``` +List of parameters for SSN node termination: + +| Parameter | Description/Value | +|----------------------------|------------------------------------------------------------------------------------| +| conf\_service\_base\_name | Unique infrastructure value | +| aws\_access\_key | AWS user access key | +| aws\_secret\_access\_key | AWS user secret access key | +| aws\_region | AWS region | +| key\_path | Path to admin key (without key name) | +| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (AWS) | +| action | terminate | + +#### In Azure +``` +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --azure_vpc_name vpc-test --azure_resource_group_name resource-group-test --azure_region westus2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider azure --azure_auth_path /dir/file.json --action terminate +``` +List of parameters for SSN node termination: + +| Parameter | Description/Value | +|----------------------------|------------------------------------------------------------------------------------| +| conf\_service\_base\_name | Unique infrastructure value | +| azure\_region | Azure region | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (Azure) | +| azure\_vpc\_name | Name of the Virtual Network (VN) | +| key\_path | Path to admin key (without key name) | +| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | +| azure\_auth\_path | Full path to auth json file | +| action | terminate | + + +#### In Google cloud +``` +/usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --gcp_project_id project_id --conf_service_base_name dlab --gcp_region us-west1 --gcp_zone us-west1-a --key_path /root/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider gcp --gcp_service_account_path /path/to/auth/file.json --action terminate +``` +List of parameters for SSN node termination: + +| Parameter | Description/Value | +|------------------------------|-----------------------------------------------------------------------------------------| +| conf\_service\_base\_name | Any infrastructure value (should be unique if multiple SSN’s have been deployed before) | +| gcp\_region | GCP region | +| gcp\_zone | GCP zone | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (GCP) | +| key\_path | Path to admin key (without key name) | +| conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | +| gcp\_service\_account\_path | Full path to auth json file | +| gcp\_project\_id | ID of GCP project | +| action | In case of SSN node termination, this parameter should be set to “terminate” | + + +## Edge Node + +Gateway node (or an Edge node) is an instance(virtual machine) provisioned in a public subnet. It serves as an entry point for accessing user’s personal analytical environment. It is created by an end-user, whose public key will be uploaded there. Only via Edge node, DLab user can access such application resources as notebook servers and dataengine clusters. Also, Edge Node is used to setup SOCKS proxy to access notebook servers via Web UI and SSH. Elastic(Static) IP address is assigned to an Edge Node. In case Edge node instance has been removed by mistake, there is an option to re-create it and Edge node IP address won’t change. + +### Create + +In order to create Edge node using DLab Web UI – login and, click on the button “Upload” (Depending on authorization provider that was chosen on deployment stage, user may be taken from [LDAP](#LDAP_Authentication) or from [Azure AD (Oauth2)](#Azure_OAuth2_Authentication)). Choose user’s SSH public key and after that click on the button “Create”. Edge node will be deployed and corresponding instance (virtual machine) will be started. + +#### In Amazon + +The following AWS resources will be created: +- Edge EC2 instance +- Elastic IP address for Edge EC2 instance +- User's S3 bucket +- Security Group for user's Edge instance +- Security Group for all further user's Notebook instances +- Security Groups for all further user's master nodes of data engine cluster +- Security Groups for all further user's slave nodes of data engine cluster +- IAM Roles and Instance Profiles for user's Edge instance +- IAM Roles and Instance Profiles all further user's Notebook instances +- User private subnet. All further nodes (Notebooks, EMR clusters) will be provisioned in different subnet than SSN. + +List of parameters for Edge node creation: + +| Parameter | Description/Value | +|--------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Name of the user | +| aws\_vpc\_id | ID of AWS VPC where infrastructure is being deployed | +| aws\_region | AWS region where infrastructure was deployed | +| aws\_security\_groups\_ids | One or more id’s of the SSN instance security group | +| aws\_subnet\_id | ID of the AWS public subnet where Edge will be deployed | +| aws\_private\_subnet\_prefix | Prefix of the private subnet | +| conf\_tag\_resource\_id | The name of tag for billing reports | +| action | create | + +#### In Azure + +The following Azure resources will be created: +- Edge virtual machine +- Static public IP address for Edge virtual machine +- Network interface for Edge node +- Security Group for user's Edge instance +- Security Group for all further user's Notebook instances +- Security Groups for all further user's master nodes of data engine cluster +- Security Groups for all further user's slave nodes of data engine cluster +- User's private subnet. All further nodes (Notebooks, data engine clusters) will be provisioned in different subnet than SSN. +- User's storage account and blob container + +List of parameters for Edge node creation: + +| Parameter | Description/Value | +|--------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Name of the user | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| azure\_region | Azure region where infrastructure was deployed | +| azure\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | +| azure\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | +| action | create | + +#### In Google cloud + +The following GCP resources will be created: +- Edge VM instance +- External static IP address for Edge VM instance +- Security Group for user's Edge instance +- Security Group for all further user's Notebook instances +- Security Groups for all further user's master nodes of data engine cluster +- Security Groups for all further user's slave nodes of data engine cluster +- User's private subnet. All further nodes (Notebooks, data engine clusters) will be provisioned in different subnet than SSN. +- User's bucket + +List of parameters for Edge node creation: + +| Parameter | Description/Value | +|--------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Name of the user | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone where infrastructure was deployed | +| gcp\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | +| gcp\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | +| gcp\_project\_id | ID of GCP project | +| action | create | + +### Start/Stop + +To start/stop Edge node, click on the button which looks like a cycle on the top right corner, then click on the button which is located in “Action” field and in the drop-down menu click on the appropriate action. + +#### In Amazon + +List of parameters for Edge node starting/stopping: + +| Parameter | Description/Value | +|---------------------------|--------------------------------------------------------------| +| conf\_resource | edge | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| edge\_user\_name | Name of the user | +| aws\_region | AWS region where infrastructure was deployed | +| action | start/stop | + +#### In Azure + +List of parameters for Edge node starting: + +| Parameter | Description/Value | +|------------------------------|---------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| edge\_user\_name | Name of the user | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| azure\_region | Azure region where infrastructure was deployed | +| action | start | + +List of parameters for Edge node stopping: + +| Parameter | Description/Value | +|------------------------------|---------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| edge\_user\_name | Name of the user | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| action | stop | + +#### In Google cloud + +List of parameters for Edge node starting/stopping: + +| Parameter | Description/Value | +|--------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| edge\_user\_name | Name of the user | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone where infrastructure was deployed | +| gcp\_project\_id | ID of GCP project | +| action | start/stop | + +### Recreate + +In case Edge node was damaged, or terminated manually, there is an option to re-create it. + +If Edge node was removed for some reason, to re-create it, click on the status button close to logged in users’s name (top right corner of the screen).Then click on gear icon in Actions column and choose “Recreate”. + +List of parameters for Edge node recreation: + +#### In Amazon + +| Parameter | Description/Value | +|----------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (Debian/RedHat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Name of the user | +| aws\_vpc\_id | ID of AWS VPC where infrastructure is being deployed | +| aws\_region | AWS region where infrastructure was deployed | +| aws\_security\_groups\_ids | ID of the SSN instance's AWS security group | +| aws\_subnet\_id | ID of the AWS public subnet where Edge was deployed | +| edge\_elastic\_ip | AWS Elastic IP address which was associated to Edge node | +| conf\_tag\_resource\_id | The name of tag for billing reports | +| action | Create | + +#### In Azure + +| Parameter | Description/Value | +|------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (Debian/RedHat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Name of the user | +| azure\_vpc\_name | NAme of Azure Virtual network where all infrastructure is being deployed | +| azure\_region | Azure region where all infrastructure was deployed | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| azure\_subnet\_name | Name of the Azure public subnet where Edge was deployed | +| action | Create | + +#### In Google cloud +| Parameter | Description/Value | +|--------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | edge | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Name of the user | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone where infrastructure was deployed | +| gcp\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | +| gcp\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | +| gcp\_project\_id | ID of GCP project | +| action | create | + +## Notebook node + +Notebook node is an instance (virtual machine), with preinstalled analytical software, needed dependencies and with pre-configured kernels and interpreters. It is the main part of personal analytical environment, which is setup by a data scientist. It can be Created, Stopped and Terminated. To support variety of analytical needs - Notebook node can be provisioned on any of cloud supported instance shape for your particular region. From analytical software, which is already pre-installed on a notebook node, end users can access (read/write) data stored on buckets/containers. + +### Create + +To create Notebook node, click on the “Create new” button. Then, in drop-down menu choose template type (jupyter/rstudio/zeppelin/tensor), enter notebook name and choose instance shape. After clicking the button “Create”, notebook node will be deployed and started. + +List of parameters for Notebook node creation: + +#### In Amazon + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| aws\_notebook\_instance\_type | Value of the Notebook EC2 instance shape | +| aws\_region | AWS region where infrastructure was deployed | +| aws\_security\_groups\_ids | ID of the SSN instance's security group | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| conf\_tag\_resource\_id | The name of tag for billing reports | +| git\_creds | User git credentials in JSON format | +| action | Create | + +**Note:** For format of git_creds see "Manage git credentials" lower. + +#### In Azure + +| Parameter | Description/Value | +|---------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| azure\_notebook\_instance\_size | Value of the Notebook virtual machine shape | +| azure\_region | Azure region where infrastructure was deployed | +| azure\_vpc\_name | NAme of Azure Virtual network where all infrastructure is being deployed | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| git\_creds | User git credentials in JSON format | +| action | Create | + +#### In Google cloud + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLAB (debian/redhat) | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| gcp\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | +| gcp\_project\_id | ID of GCP project | +| gcp\_notebook\_instance\_size | Value of the Notebook VM instance size | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone where infrastructure was deployed | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| git\_creds | User git credentials in JSON format | +| action | Create | + +### Stop + +In order to stop Notebook node, click on the “gear” button in Actions column. From the drop-down menu click on “Stop” action. + +List of parameters for Notebook node stopping: + +#### In Amazon + +| Parameter | Description/Value | +|---------------------------|--------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| aws\_region | AWS region where infrastructure was deployed | +| action | Stop | + +#### In Azure + +| Parameter | Description/Value | +|---------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| action | Stop | + +#### In Google cloud + +| Parameter | Description/Value | +|---------------------------|--------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone where infrastructure was deployed | +| gcp\_project\_id | ID of GCP project | +| action | Stop | + +### Start + +In order to start Notebook node, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Start” action. + +List of parameters for Notebook node start: + +#### In Amazon + +| Parameter | Description/Value | +|---------------------------|--------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| aws\_region | AWS region where infrastructure was deployed | +| git\_creds | User git credentials in JSON format | +| action | start | + +**Note:** For format of git_creds see "Manage git credentials" lower. + +#### In Azure + +| Parameter | Description/Value | +|---------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| azure\_region | Azure region where infrastructure was deployed | +| git\_creds | User git credentials in JSON format | +| action | start | + +#### In Google cloud + +| Parameter | Description/Value | +|---------------------------|--------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone where infrastructure was deployed | +| gcp\_project\_id | ID of GCP project | +| git\_creds | User git credentials in JSON format | +| action | Stop | + +### Terminate + +In order to terminate Notebook node, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Terminate” action. + +List of parameters for Notebook node termination: + +#### In Amazon + +| Parameter | Description/Value | +|---------------------------|--------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| aws\_region | AWS region where infrastructure was deployed | +| action | terminate | + +**Note:** If terminate action is called, all connected data engine clusters will be removed. + +#### In Azure + +| Parameter | Description/Value | +|---------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| action | terminate | + +#### In Google cloud + +| Parameter | Description/Value | +|---------------------------|--------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone where infrastructure was deployed | +| gcp\_project\_id | ID of GCP project | +| git\_creds | User git credentials in JSON format | +| action | Stop | + +### List/Install additional libraries + +In order to list available libraries (OS/Python2/Python3/R/Others) on Notebook node, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. + +#### In Amazon + +List of parameters for Notebook node to **get list** of available libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| aws\_region | AWS region where infrastructure was deployed | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| action | lib_list | + +**Note:** This operation will return a file with response **[edge_user_name]\_[application]\_[request_id]\_all\_pkgs.json** + +**Example** of available libraries in response (type->library->version): + +``` +{ + "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, + "pip2": {"requests": "N/A", "configparser": "N/A"}, + "pip3": {"configparser": "N/A"}, + "r_pkg": {"rmarkdown": "1.5"}, + "others": {"Keras": "N/A"} +} +``` + + +List of parameters for Notebook node to **install** additional libraries: + +| Parameter | Description/Value | +|-------------------------------|--------------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| aws\_region | AWS region where infrastructure was deployed | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| +| action | lib_install | + +**Example** of additional_libs parameter: + +``` +{ + ... + "libs": [ + {"group": "os_pkg", "name": "nmap"}, + {"group": "os_pkg", "name": "htop"}, + {"group": "pip2", "name": "requests"}, + {"group": "pip3", "name": "configparser"}, + {"group": "r_pkg", "name": "rmarkdown"}, + {"group": "others", "name": "Keras"} + ] + ... +} +``` + +#### In Azure + +List of parameters for Notebook node to **get list** of available libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| action | lib_list | + +List of parameters for Notebook node to **install** additional libraries: + +| Parameter | Description/Value | +|-------------------------------|--------------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| +| action | lib_install | + + +#### In Google cloud + +List of parameters for Notebook node to **get list** of available libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| gcp\_project\_id | ID of GCP project | +| gcp\_zone | GCP zone name | +| action | lib_list | + +List of parameters for Notebook node to **install** additional libraries: + +| Parameter | Description/Value | +|-------------------------------|--------------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| gcp\_project\_id | ID of GCP project | +| gcp\_zone | GCP zone name | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| +| action | lib_install | + +### Manage git credentials + +In order to manage git credentials on Notebook node, click on the button “Git credentials”. Then in menu you can add or edit existing credentials. + +#### In Amazon + +List of parameters for Notebook node to **manage git credentials**: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| aws\_region | AWS region where infrastructure was deployed | +| git\_creds | User git credentials in JSON format | +| action | git\_creds | + +**Example** of git_creds parameter: + +``` +[{ + "username": "Test User", + "email": "test@example.com", + "hostname": "github.com", + "login": "testlogin", + "password": "testpassword" +}, ...] +``` + +**Note:** Fields "username" and "email" are used for commits (displays Author in git log). + +**Note:** Leave "hostname" field empty to apply login/password by default for all services. + +**Note:** Also your can use "Personal access tokens" against passwords. + +#### In Azure + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| git\_creds | User git credentials in JSON format | +| action | git\_creds | + +#### In Google cloud + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | notebook | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| gcp\_project\_id | ID of GCP project | +| gcp\_region | GCP region name | +| gcp\_zone | GCP zone name | +| notebook\_instance\_name | Name of the Notebook instance to terminate | +| git\_creds | User git credentials in JSON format | +| action | git\_creds | + +## Dataengine-service cluster + +Dataengine-service is a cluster provided by cloud as a service (EMR on AWS) can be created if more computational resources are needed for executing analytical algorithms and models, triggered from analytical tools. Jobs execution will be scaled to a cluster mode increasing the performance and decreasing execution time. + +### Create + +To create dataengine-service cluster click on the “gear” button in Actions column, and click on “Add computational resources”. Specify dataengine-service version, fill in dataengine-service name, specify number of instances and instance shapes. Click on the “Create” button. + +List of parameters for dataengine-service cluster creation: + +#### In Amazon + +| Parameter | Description/Value | +|-----------------------------|--------------------------------------------------------------------------| +| conf\_resource | dataengine-service | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| emr\_timeout | Value of timeout for dataengine-service during build. | +| emr\_instance\_count | Amount of instance in dataengine-service cluster | +| emr\_master\_instance\_type | Value for dataengine-service EC2 master instance shape | +| emr\_slave\_instance\_type | Value for dataengine-service EC2 slave instances shapes | +| emr\_version | Available versions of dataengine-service (emr-5.2.0/emr-5.3.1/emr-5.6.0) | +| notebook\_instance\_name | Name of the Notebook dataengine-service will be linked to | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| aws\_region | AWS region where infrastructure was deployed | +| conf\_tag\_resource\_id | The name of tag for billing reports | +| action | create | + +**Note:** If “Spot instances” is enabled, dataengine-service Slave nodes will be created as EC2 Spot instances. + +#### In Google cloud + +| Parameter | Description/Value | +|---------------------------------|--------------------------------------------------------------------------| +| conf\_resource | dataengine-service | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| notebook\_instance\_name | Name of the Notebook dataengine-service will be linked to | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| gcp\_subnet\_name | Name of subnet | +| dataproc\_version | Version of Dataproc | +| dataproc\_master\_count | Number of master nodes | +| dataproc\_slave\_count | Number of slave nodes | +| dataproc\_preemptible\_count | Number of preemptible nodes | +| dataproc\_master\_instance\_type| Size of master node | +| dataproc\_slave\_instance\_type | Size of slave node | +| gcp\_project\_id | ID of GCP project | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone name | +| conf\_tag\_resource\_id | The name of tag for billing reports | +| action | create | + +### Terminate + +In order to terminate dataengine-service cluster, click on “x” button which is located in “Computational resources” field. + +List of parameters for dataengine-service cluster termination: + +#### In Amazon + +| Parameter | Description/Value | +|---------------------------|---------------------------------------------------------------------| +| conf\_resource | dataengine-service | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| emr\_cluster\_name | Name of the dataengine-service to terminate | +| notebook\_instance\_name | Name of the Notebook instance which dataengine-service is linked to | +| aws\_region | AWS region where infrastructure was deployed | +| action | Terminate | + +#### In Google cloud + +| Parameter | Description/Value | +|---------------------------|---------------------------------------------------------------------| +| conf\_resource | dataengine-service | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance which dataengine-service is linked to | +| gcp\_project\_id | ID of GCP project | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone name | +| dataproc\_cluster\_name | Dataproc cluster name | +| action | Terminate | + +### List/Install additional libraries + +In order to list available libraries (OS/Python2/Python3/R/Others) on Dataengine-service, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. + +#### In Amazon + +List of parameters for Dataengine-service node to **get list** of available libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine-service | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| computational\_id | Name of Dataengine-service | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| aws\_region | AWS region where infrastructure was deployed | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| action | lib_list | + +**Note:** This operation will return a file with response **[edge_user_name]\_[application]\_[request_id]\_all\_pkgs.json** + +**Example** of available libraries in response (type->library->version): + +``` +{ + "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, + "pip2": {"requests": "N/A", "configparser": "N/A"}, + "pip3": {"configparser": "N/A"}, + "r_pkg": {"rmarkdown": "1.5"}, + "others": {"Keras": "N/A"} +} +``` + + +List of parameters for Dataengine-service to **install** additional libraries: + +| Parameter | Description/Value | +|-------------------------------|--------------------------------------------------------------------------------------| +| conf\_resource | dataengine-service | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| computational\_id | Name of Dataengine-service | +| aws\_region | AWS region where infrastructure was deployed | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| +| action | lib_install | + +**Example** of additional_libs parameter: + +``` +{ + ... + "libs": [ + {"group": "os_pkg", "name": "nmap"}, + {"group": "os_pkg", "name": "htop"}, + {"group": "pip2", "name": "requests"}, + {"group": "pip3", "name": "configparser"}, + {"group": "r_pkg", "name": "rmarkdown"}, + {"group": "others", "name": "Keras"} + ] + ... +} +``` + +#### In Google cloud + +List of parameters for Dataengine-service node to **get list** of available libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine-service | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| gcp\_project\_id | ID of GCP project | +| gcp\_region | GCP region name | +| gcp\_zone | GCP zone name | +| action | lib_list | + +List of parameters for Dataengine-service node to **install** additional libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine-service | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| gcp\_project\_id | ID of GCP project | +| gcp\_region | GCP region name | +| gcp\_zone | GCP zone name | +| action | lib_install | + + +## Dataengine cluster + +Dataengine is cluster based on Standalone Spark framework can be created if more computational resources are needed for executing analytical algorithms, but without additional expenses for cloud provided service. + +### Create + +To create Spark standalone cluster click on the “gear” button in Actions column, and click on “Add computational resources”. Specify dataengine version, fill in dataengine name, specify number of instances and instance shapes. Click on the “Create” button. + +List of parameters for dataengine cluster creation: + +#### In Amazon + +| Parameter | Description/Value | +|--------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| notebook\_instance\_name | Name of the Notebook dataengine will be linked to | +| dataengine\_instance\_count | Number of nodes in cluster | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| aws\_region | Amazon region where all infrastructure was deployed | +| aws\_dataengine\_master\_size | Size of master node | +| aws\_dataengine\_slave\_size | Size of slave node | +| action | create | + +#### In Azure + +| Parameter | Description/Value | +|--------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| notebook\_instance\_name | Name of the Notebook dataengine will be linked to | +| dataengine\_instance\_count | Number of nodes in cluster | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| azure\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | +| azure\_region | Azure region where all infrastructure was deployed | +| azure\_dataengine\_master\_size| Size of master node | +| azure\_dataengine\_slave\_size | Size of slave node | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| azure\_subnet\_name | Name of the Azure public subnet where Edge was deployed | +| action | create | + +#### In Google cloud + +| Parameter | Description/Value | +|------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | +| notebook\_instance\_name | Name of the Notebook dataengine will be linked to | +| gcp\_vpc\_name | GCP VPC name | +| gcp\_subnet\_name | GCP subnet name | +| dataengine\_instance\_count | Number of nodes in cluster | +| gcp\_dataengine\_master\_size| Size of master node | +| gcp\_dataengine\_slave\_size | Size of slave node | +| gcp\_project\_id | ID of GCP project | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone name | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| action | create | + + +### Terminate + +In order to terminate dataengine cluster, click on “x” button which is located in “Computational resources” field. + +List of parameters for dataengine cluster termination: + +#### In Amazon + +| Parameter | Description/Value | +|------------------------------|--------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance which dataengine is linked to | +| computational\_name | Name of cluster | +| aws\_region | AWS region where infrastructure was deployed | +| action | Terminate | + +#### In Azure + +| Parameter | Description/Value | +|------------------------------|--------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| computational\_name | Name of cluster | +| notebook\_instance\_name | Name of the Notebook instance which dataengine is linked to | +| azure\_region | Azure region where infrastructure was deployed | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned| +| action | Terminate | + +#### In Google cloud + +| Parameter | Description/Value | +|------------------------------|--------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| notebook\_instance\_name | Name of the Notebook instance which dataengine is linked to | +| computational\_name | Name of cluster | +| gcp\_project\_id | ID of GCP project | +| gcp\_region | GCP region where infrastructure was deployed | +| gcp\_zone | GCP zone name | +| action | Terminate | + +### List/Install additional libraries + +In order to list available libraries (OS/Python2/Python3/R/Others) on Dataengine, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. + +#### In Amazon + +List of parameters for Dataengine node to **get list** of available libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| computational\_id | Name of cluster | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| action | lib_list | + +**Note:** This operation will return a file with response **[edge_user_name]\_[application]\_[request_id]\_all\_pkgs.json** + +**Example** of available libraries in response (type->library->version): + +``` +{ + "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, + "pip2": {"requests": "N/A", "configparser": "N/A"}, + "pip3": {"configparser": "N/A"}, + "r_pkg": {"rmarkdown": "1.5"}, + "others": {"Keras": "N/A"} +} +``` + + +List of parameters for Dataengine node to **install** additional libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| computational\_id | Name of cluster | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| action | lib_install | + +**Example** of additional_libs parameter: + +``` +{ + ... + "libs": [ + {"group": "os_pkg", "name": "nmap"}, + {"group": "os_pkg", "name": "htop"}, + {"group": "pip2", "name": "requests"}, + {"group": "pip3", "name": "configparser"}, + {"group": "r_pkg", "name": "rmarkdown"}, + {"group": "others", "name": "Keras"} + ] + ... +} +``` + +#### In Azure + +List of parameters for Dataengine node to **get list** of available libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| computational\_id | Name of cluster | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| action | lib_list | + +List of parameters for Dataengine node to **install** additional libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | +| computational\_id | Name of cluster | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| action | lib_install | + + +#### In Google cloud + +List of parameters for Dataengine node to **get list** of available libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| gcp\_project\_id | ID of GCP project | +| gcp\_zone | GCP zone name | +| computational\_id | Name of cluster | +| action | lib_list | + +List of parameters for Dataengine node to **install** additional libraries: + +| Parameter | Description/Value | +|-------------------------------|-----------------------------------------------------------------------------------| +| conf\_resource | dataengine | +| conf\_service\_base\_name | Unique infrastructure value, specified during SSN deployment | +| conf\_key\_name | Name of the uploaded SSH key file (without ".pem") | +| edge\_user\_name | Value that previously was used when Edge being provisioned | +| application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | +| gcp\_project\_id | ID of GCP project | +| gcp\_zone | GCP zone name | +| computational\_id | Name of cluster | +| action | lib_install | + + +## Configuration files + +DLab configuration files are located on SSN node by following path: +- /opt/dlab/conf ssn.yml – basic configuration for all java services; +- provisioning.yml – Provisioning Service configuration file;for +- security.yml – Security Service configuration file; +- self-service.yml – Self-Service configuration file. + +## Starting/Stopping services + +All DLab services running as OS services and have next syntax for +starting and stopping: +``` +sudo supervisorctl {start | stop | status} [all | provserv | secserv | ui] +``` +- start – starting service or services; +- stop – stopping service or services; +- status – show status of service or services; +- all – execute command for all services, this option is default; +- provserv – execute command for Provisioning Service; +- secserv – execute command for Security Service; +- ui – execute command for Self-Service. + +## DLab Web UI + +DLab self service is listening to the secure 8443 port. This port is used for secure local communication with provisioning service. + +There is also Nginx proxy server running on Self-Service node, which proxies remote connection to local 8443 port. +Nginx server is listening to both 80 and 443 ports by default. It means that you could access self-service Web UI using non-secure connections (80 port) or secure (443 port). + +Establishing connection using 443 port you should take into account that DLab uses self-signed certificate from the box, however you are free to switch Nginx to use your own domain-verified certificate. + +To disable non-secure connection please do the following: +- uncomment at /etc/nginx/conf.d/nginx_proxy.conf file rule that rewrites all requests from 80 to 443 port; +- reload/restart Nginx web server. + +To use your own certificate please do the following: +- upload your certificate and key to Self-Service node; +- specify at /etc/nginx/conf.d/nginx_proxy.conf file the correct path to your new ssl_certificate and ssl_certificate_key; +- reload/restart Nginx web server. + +## Billing report + +### AWS + +Billing module is implemented as a separate jar file and can be running in the follow modes: + +- part of Self-Service; +- separate system process; +- manual loading or use external scheduler; + +The billing module is running as part of the Self-Service (if billing was switched ON before SSN deployment). For details please refer to section [Self-Service Node](#Self_Service_Node). Otherwise, you should manually configure file billing.yml. See the descriptions how to do this in the configuration file. Please also note, that you should also add an entry in the Mongo database into collection: +``` +{ + "_id": "conf_tag_resource_id", + "Value": "" +} +``` +After you have configured the billing, you can run it as a process of Self-Service. To do this, in the configuration file self-service.yml set the property **BillingSchedulerEnabled** to **true** and restart the Self-Service: +``` +sudo supervisorctl stop ui +sudo supervisorctl start ui +``` +If you want to load report manually, or use external scheduler use following command: +``` +java -jar /opt/dlab/webapp/lib/billing/billing-aws.x.y.jar --conf /opt/dlab/conf/billing.yml +or +java -cp /opt/dlab/webapp/lib/billing/billing-aws.x.y.jar com.epam.dlab.BillingTool --conf /opt/dlab/conf/billing.yml +``` +If you want billing to work as a separate process from the Self-Service use following command: +``` +java -cp /opt/dlab/webapp/lib/billing/billing-aws.x.y.jar com.epam.dlab.BillingScheduler --conf /opt/dlab/conf/billing.yml +``` + +### Azure + +Billing module is implemented as a separate jar file and can be running in the follow modes: + +- part of Self-Service; +- separate system process; + +If you want to start billing module as a separate process use the following command: +``` +java -jar /opt/dlab/webapp/lib/billing/billing-azure.x.y.jar /opt/dlab/conf/billing.yml +``` + +## Backup and Restore + +All DLab configuration files, keys, certificates, jars, database and logs can be saved to backup file. + +Scripts for backup and restore is located in ```dlab_path/tmp/```. Default: ```/opt/dlab/tmp/``` + +List of parameters for run backup: + +| Parameter | Description/Value | +|----------------|-------------------------------------------------------------------------------------------------------------------------| +| --dlab\_path | Path to DLab. Default: /opt/dlab/ | +| --configs | Comma separated names of config files, like "security.yml", etc. Default: all | +| --keys | Comma separated names of keys, like "user_name.pub". Default: all | +| --certs | Comma separated names of SSL certificates and keys, like "dlab.crt", etc. Also available: skip. Default: all | +| --jars | Comma separated names of jar application, like "self-service" (without .jar), etc. Also available: all. Default: skip | +| --db | Mongo DB. Key without arguments. Default: disable | +| --logs | All logs (include docker). Key without arguments. Default: disable | + +List of parameters for run restore: + +| Parameter | Description/Value | +|----------------|-------------------------------------------------------------------------------------------------------------------------| +| --dlab\_path | Path to DLab. Default: /opt/dlab/ | +| --configs | Comma separated names of config files, like "security.yml", etc. Default: all | +| --keys | Comma separated names of keys, like "user_name.pub". Default: all | +| --certs | Comma separated names of SSL certificates and keys, like "dlab.crt", etc. Also available: skip. Default: all | +| --jars | Comma separated names of jar application, like "self-service" (without .jar), etc. Also available: all. Default: skip | +| --db | Mongo DB. Key without arguments. Default: disable | +| --file | Full or relative path to backup file or folder. Required field | +| --force | Force mode. Without any questions. Key without arguments. Default: disable | + +**Note:** You can type ```-h``` or ```--help``` for usage details. + +**Note:** Restore process required stopping services. + +## GitLab server + +Own GitLab server can be deployed from SSN node with script, which located in: + +```dlab_path/tmp/gitlab```. Default: ```/opt/dlab/tmp/gitlab``` + +All initial configuration parameters located in ```gitlab.ini``` file. + +Some of parameters are already setuped from SSN provisioning. + +GitLab uses the same LDAP server as DLab. + +To deploy Gitlab server, set all needed parameters in ```gitlab.ini``` and run script: + +```./gitlab_deploy.py --action [create/terminate]``` + +**Note:** Terminate process uses ```node_name``` to find instance. + +**Note:** GitLab wouldn't be terminated with all environment termination process. + +## Troubleshooting + +If the parameter dlab\_path of configuration file dlab.ini wasn’t changed, the path to DLab service would default to: + +- /opt/dlab/ - main directory of DLab service +- /var/opt/dlab/log/ or /var/log/dlab/ - path to log files + +To check logs of Docker containers run the following commands: +``` +docker ps -a – to get list of containers which were executed. +... +a85d0d3c27aa docker.dlab-dataengine:latest "/root/entrypoint...." 2 hours ago Exited (0) 2 hours ago infallible_gallileo +6bc2afeb888e docker.dlab-jupyter:latest "/root/entrypoint...." 2 hours ago Exited (0) 2 hours ago practical_cori +51b71c5d4aa3 docker.dlab-zeppelin:latest "/root/entrypoint...." 2 hours ago Exited (0) 2 hours ago determined_knuth +... +docker logs – to get log for particular Docker container. +``` + +To change Docker images on existing environment, you can run script on SSN node that rebuilds docker images with the command: +``` +docker-build all #to rebuild all images +``` +or +``` +docker-build #to rebuild certain images +``` + +You can also rebuild images manually by executing the following steps: + +1. SSH to SSN instance +2. go to */opt/dlab/sources/* +3. Modify needed files +[4]. [ONLY FOR AZURE] Copy service principal json file with credentials to base/azure_auth.json +5. Rebuild proper Docker images, using one or several commands (depending on what files you’ve changed): +``` +docker build --build-arg OS= --file general/files//base_Dockerfile -t docker.dlab-base . +docker build --build-arg OS= --file general/files//edge_Dockerfile -t docker.dlab-edge . +docker build --build-arg OS= --file general/files//jupyter_Dockerfile -t docker.dlab-jupyter . +docker build --build-arg OS= --file general/files//rstudio_Dockerfile -t docker.dlab-rstudio . +docker build --build-arg OS= --file general/files//zeppelin_Dockerfile -t docker.dlab-zeppelin . +docker build --build-arg OS= --file general/files//tensor_Dockerfile -t docker.dlab-tensor . +docker build --build-arg OS= --file general/files//tensor-rstudio_Dockerfile -t docker.dlab-tensor-rstudio . +docker build --build-arg OS= --file general/files//deeplearning_Dockerfile -t docker.dlab-deeplearning . +docker build --build-arg OS= --file general/files//dataengine_Dockerfile -t docker.dlab-dataengine . +``` + +---------------- +# Development + +DLab services could be ran in development mode. This mode emulates real work an does not create any resources on cloud provider environment. + +## Folder structure + + dlab + ├───infrastructure-provisioning + └───services + ├───billing + ├───common + ├───provisioning-service + ├───security-service + ├───self-service + └───settings + +- infrastructure-provisioning – code of infrastructure-provisioning module; +- services – back-end services source code; + - billing – billing module for AWS cloud provider only; + - common – reusable code for all services; + - provisioning-service – Provisioning Service; + - security-service – Security Service; + - self-service – Self-Service and UI; + - settings – global settings that are stored in mongo database in development mode; + +## Pre-requisites + +In order to start development of Front-end Web UI part of DLab - Git repository should be cloned and the following packages should be installed: + +- Git 1.7 or higher +- Python 2.7 with library Fabric v1.14.0 +- Docker 1.12 - Infrastructure provisioning + +## Java back-end services + +### Java components description + +#### Common + +Common is a module, which wraps set of reusable code over services. Commonly reused functionality is as follows: + +1. Models +2. REST client +3. Mongo persistence DAO +4. Security models and DAO + +#### Self-Service + +Self-Service provides REST based API’s. It tightly interacts with Provisioning Service and Security Service and actually delegates most of user\`s requests for execution. + +| API class name | Supported actions | Description | +|---------------------------------|-------------------------------------------------------|------------------------| +| BillingResource | Get billing invoice
Export billing invoice in CSV file | Provides billing information. | +| ComputationalResource | Configuration limits
Create
Terminate | Used for computational resources management. | +| EdgeResource | Start
Stop
Status | Manage EDGE node. | +| ExploratoryResource | Create
Status
Start
Stop
Terminate | Used for exploratory environment management. | +| GitCredsResource | Update credentials
Get credentials | Used for exploratory environment management. | +| InfrastructureInfoResource | Get info of environment
Get status of environment | Used for obtaining statuses and additional information about provisioned resources | +| InfrastructureTemplatesResource | Get computation resources templates
Get exploratory environment templates | Used for getting exploratory/computational templates | +| KeyUploaderResource | Check key
Upload key
Recover | Used for Gateway/EDGE node public key upload and further storing of this information in Mongo DB. | +| LibExploratoryResource | Lib groups
Lib list
Lib search
Lib install | User’s authentication. | +| SecurityResource | Login
Authorize
Logout | User’s authentication. | +| UserSettingsResource | Get settings
Save settings | User’s preferences. | + +Some class names may have endings like Aws or Azure(e.g. ComputationalResourceAws, ComputationalResourceAzure, etc...). It means that it's cloud specific class with a proper API + + +#### Provisioning Service + +The Provisioning Service is key, REST based service for management of cloud specific or Docker based environment resources like computational, exploratory, +edge, etc. + +| API class name | Supported actions | Description | +|---------------------------|-----------------------------------------|------------------------------------------------------------------------------| +| ComputationalResource | Create
Terminate | Docker actions for computational resources management. | +| DockerResource | Get Docker image
Run Docker image | Requests and describes Docker images and templates. | +| EdgeResource | Create
Start
Stop | Provides Docker actions for EDGE node management. | +| ExploratoryResource | Create
Start
Stop
Terminate | Provides Docker actions for working with exploratory environment management. | +| GitExploratoryResource | Update git greds | Docker actions to provision git credentials to running notebooks | +| InfrastructureResource | Status | Docker action for obtaining status of DLab infrastructure instances. | +| LibExploratoryResource | Lib list
Install lib | Docker actions to install libraries on netobboks | + +Some class names may have endings like Aws or Azure(e.g. ComputationalResourceAws, ComputationalResourceAzure, etc...). It means that it's cloud specific class with a proper API + +#### Security service + +Security service is REST based service for user authentication against LDAP/LDAP + AWS/Azure OAuth2 depending on module configuration and cloud provider. +LDAP only provides with authentication end point that allows to verify authenticity of users against LDAP instance. +If you use AWS cloud provider LDAP + AWS authentication could be useful as it allows to combine LDAP authentication and verification if user has any role in AWS account + +DLab provides OAuth2(client credentials and authorization code flow) security authorization mechanism for Azure users. This kind of authentication is required when you are going to use Data Lake. If Data Lake is not enabled you have two options LDAP or OAuth2 +If OAuth2 is in use security-service validates user's permissions to configured permission scope(resource in Azure). +If Data Lake is enabled default permission scope(can be configured manually after deploy DLab) is Data Lake Store account so only if user has any role in scope of Data Lake Store Account resource he/she will be allowed to log in +If Data Lake is disabled but Azure OAuth2 is in use default permission scope will be Resource Group where DLab is created and only users who have any roles in the resource group will be allowed to log in. + + +## Front-end + +### Front-end components description + +Web UI sources are part of Self-Service. + +Sources are located in dlab/services/self-service/src/main/resources/webapp + +| Main pages | Components and Services | +|-------------------------------|-------------------------| +| Login page | LoginComponent
*applicationSecurityService* handles http calls and stores authentication tokens on the client and attaches the token to authenticated calls;
*healthStatusService* and *appRoutingService* check instances states and redirect to appropriate page. | +| Home page (list of resources) | HomeComponent
nested several main components like ResourcesGrid for notebooks data rendering and filtering, using custom MultiSelectDropdown component;
multiple modal dialogs components used for new instances creation, displaying detailed info and actions confirmation. | +| Health Status page | HealthStatusComponent
*HealthStatusGridComponent* displays list of instances, their types, statutes, ID’s and uses *healthStatusService* for handling main actions. | +| Help pages | Static pages that contains information and instructions on how to access Notebook Server and generate SSH key pair. Includes only *NavbarComponent*. | +| Error page | Simple static page letting users know that opened page does not exist. Includes only *NavbarComponent*. | +| Reporting page | ReportingComponent
ReportingGridComponent displays billing detailed info with built-in filtering and DateRangePicker component for custom range filtering;
uses *BillingReportService* for handling main actions and exports report data to .csv file. | + +## How to setup local development environment + +The development environment setup description is written with assumption that user already has installed Java8 (JDK), Maven3 and set environment variables (JAVA\_HOME, M2\_HOME).­­­­­­ The description will cover Mongo installation, Mongo user creation, filling initial data into Mongo, Node.js installation + +### Install Mongo database + + * Download MongoDB from [https://www.mongodb.com/download-center](https://www.mongodb.com/download-center) + * Install database based on MongoDB instructions + * Start DB server and create accounts +``` +use admin +db.createUser( + { + user: "admin", + pwd: "", + roles: [ { role: "dbAdminAnyDatabase", db: "admin" }, + { role: "userAdminAnyDatabase", db: "admin" }, + { role: "readWriteAnyDatabase", db: "admin" } ] + } +) +use +db.createUser( + { + user: "admin", + pwd: "", + roles: [ "dbAdmin", "userAdmin", "readWrite" ] + } +) +``` + + * Load collections form file dlab/services/settings/(aws|azure)/mongo_settings.json + +``` +mongoimport -u admin -p -d -c settings mongo_settings.json +``` + + * Load collections form file dlab/infrastructure-provisioning/src/ssn/files/mongo_roles.json + +``` +mongoimport -u admin -p -d --jsonArray -c roles mongo_roles.json +``` + +### Setting up environment options + + * Set option CLOUD_TYPE to aws/azure, DEV\_MODE to **true**, mongo database name and password in configuration file dlab/infrastructure-provisioning/src/ssn/templates/ssn.yml + +``` +<#assign CLOUD_TYPE="aws"> +... +<#assign DEV_MODE="true"> +... +mongo: + database: + password: +``` + + * Add system environment variable DLAB\_CONF\_DIR=<dlab\_root\_folder>/dlab/infrastructure-provisioning/src/ssn/templates/ssn.yml or create two symlinks in dlab/services/provisioning-service and dlab/services/self-service folders for file dlab/infrastructure-provisioning/src/ssn/templates/ssn.yml. + +*Unix* + +``` +ln -s ../../infrastructure-provisioning/src/ssn/templates/ssn.yml ssn.yml +``` + +*Windows* + +``` +mklink ssn.yml ..\\..\\infrastructure-provisioning\\src\\ssn\\templates\\ssn.yml +``` + + * For Unix system create two folders and grant permission for writing: + +``` +/var/opt/dlab/log/ssn +/opt/dlab/tmp/result +``` + +### Install Node.js + + * Download Node.js from [https://nodejs.org/en](https://nodejs.org/en) + * Install Node.js + * Make sure that the installation folder of Node.js has been added to the system environment variable **PATH** + * Install latest packages + +``` +npm install npm@latest -g +``` + +### Build Web UI components + + * Change folder to dlab/services/self-service/src/main/resources/webapp and install the dependencies from a package.json manifest + +``` +npm install +``` + * Replace CLOUD_PROVIDER options with aws|azure in dictionary file
dlab/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts + +``` +import { NAMING_CONVENTION } from './(aws|azure).dictionary'; + +export * from './(aws|azure).dictionary'; +``` + * Build web application + +``` +npm run build.prod +``` + +### Prepare HTTPS prerequisites + +To enable a SSL connection the web server should have a Digital Certificate. +To create a server certificate, follow these steps: + + * Create the keystore. + + * Export the certificate from the keystore. + + * Sign the certificate. + + * Import the certificate into a truststore: a repository of certificates used for verifying the certificates. A truststore typically contains more than one certificate. + +Please find below set of commands to create certificate, depending on OS. + +#### Create Unix/Ubuntu server certificate + +Pay attention that the last command has to be executed with administrative permissions. +``` +keytool -genkeypair -alias dlab -keyalg RSA -storepass KEYSTORE_PASSWORD -keypass KEYSTORE_PASSWORD -keystore ~/keys/dlab.keystore.jks -keysize 2048 -dname "CN=localhost" +keytool -exportcert -alias dlab -storepass KEYSTORE_PASSWORD -file ~/keys/dlab.crt -keystore ~/keys/dlab.keystore.jks +sudo keytool -importcert -trustcacerts -alias dlab -file ~/keys/dlab.crt -noprompt -storepass changeit -keystore ${JRE_HOME}/lib/security/cacerts +``` +#### Create Windows server certificate + +Pay attention that the last command has to be executed with administrative permissions. +To achieve this the command line (cmd) should be ran with administrative permissions. +``` +"%JRE_HOME%\bin\keytool" -genkeypair -alias dlab -keyalg RSA -storepass KEYSTORE_PASSWORD -keypass KEYSTORE_PASSWORD -keystore :\home\%USERNAME%\keys\dlab.keystore.jks -keysize 2048 -dname "CN=localhost" +"%JRE_HOME%\bin\keytool" -exportcert -alias dlab -storepass KEYSTORE_PASSWORD -file :\home\%USERNAME%\keys\dlab.crt -keystore :\home\%USERNAME%\keys\dlab.keystore.jks +"%JRE_HOME%\bin\keytool" -importcert -trustcacerts -alias dlab -file :\home\%USERNAME%\keys\dlab.crt -noprompt -storepass changeit -keystore "%JRE_HOME%\lib\security\cacerts" + +Useful command +"%JRE_HOME%\bin\keytool" -list -alias dlab -storepass changeit -keystore "%JRE_HOME%\lib\security\cacerts" +"%JRE_HOME%\bin\keytool" -delete -alias dlab -storepass changeit -keystore "%JRE_HOME%\lib\security\cacerts" +``` +Where the `````` must be the drive letter where you run the DLab. + + +## How to run locally + +There is a possibility to run Self-Service and Provisioning Service locally. All requests from Provisioning Service to Docker are mocked and instance creation status will be persisted to Mongo (only without real impact on Docker and AWS). Security Service can\`t be running on local machine because of local LDAP mocking complexity. + +Both services, Self-Service and Provisioning Service are dependent on dlab/provisioning-infrastructure/ssn/templates/ssn.yml configuration file. Both services have main functions as entry point, SelfServiceApplication for Self-Service and ProvisioningServiceApplication for Provisioning Service. Services could be started by running main methods of these classes. Both main functions require two arguments: + + * Run mode (“server”) + * Configuration file name (“self-service.yml” or “provisioning.yml” depending on the service). Both files are located in root service directory. These configuration files contain service settings and are ready to use. + +The services start up order does matter. Since Self-Service depends on Provisioning Service, the last should be started first and Self-Service afterwards. Services could be started from local IDEA (Eclipse or Intellij Idea) “Run” functionality of toolbox. + +Run application flow is following: + + * Run provisioning-service passing 2 arguments: server, provisioning.yml + * Run self-service passing 2 arguments: server, self-service.yml + * Try to access self-service Web UI by https://localhost:8443 + +``` +User: test +Password: +``` + +## Infrastructure provisioning + +### DevOps components overview + +The following list shows common structure of scripts for deploying DLab + +#### Folder structure + + dlab + └───infrastructure-provisioning + └───src + ├───base + ├───dataengine + ├───dataengine-service + ├───deeplearning + ├───edge + ├───general + ├───jupyter + ├───rstudio + ├───ssn + ├───tensor + └───zeppelin + +Each directory except *general* contains Python scripts, Docker files, templates, files for appropriate Docker image. + +- base – Main Docker image. It is a common/base image for other ones. +- edge – Docker image for Edge node. +- dataengine – Docker image for dataengine cluster. +- dataengine-service – Docker image for dataengine-service cluster. +- general – OS and CLOUD dependent common source. +- ssn – Docker image for Self-Service node (SSN). +- jupyter/rstudio/zeppelin/tensor/deeplearning – Docker images for Notebook nodes. + +All Python scripts, Docker files and other files, which are located in these directories, are OS and CLOUD independent. + +OS, CLOUD dependent and common for few templates scripts, functions, files are located in general directory. + + general + ├───api – all available API + ├───conf – DLab configuration + ├───files – OS/Cloud dependent files + ├───lib – OS/Cloud dependent functions + ├───scripts – OS/Cloud dependent Python scripts + └───templates – OS/Cloud dependent templates + +These directories may contain differentiation by operating system (Debian/RedHat) or cloud provider (AWS). + +Directories of templates (SSN, Edge etc.) contain only scripts, which are OS and CLOUD independent. + +If script/function is OS or CLOUD dependent, it should be located in appropriate directory/library in general folder. + +The following table describes mostly used scripts: + +| Script name/Path | Description | +|------------------------------|--------------------------------------------------------------------------------------------------| +| Dockerfile | Used for building Docker images and represents which Python scripts, templates and other files are needed. Required for each template. | +| base/entrypoint.py | This file is executed by Docker. It is responsible for setting environment variables, which are passed from Docker and for executing appropriate actions (script in general/api/). | +| base/scripts/\*.py | Scripts, which are OS independent and are used in each template. | +| general/api/\*.py | API scripts, which execute appropriate function from fabfile.py. | +| template\_name/fabfile.py | Is the main file for template and contains all functions, which can be used as template actions. | +| template\_name/scripts/\*.py | Python scripts, which are used for template. They are OS and CLOUD independent. | +| general/lib/aws/\*.py | Contains all functions related to AWS. | +| general/lib/os/ | This directory is divided by type of OS. All OS dependent functions are located here. | +| general/lib/os/fab.py | Contains OS independent functions used for multiple templates. | +| general/scripts/ | Directory is divided by type of Cloud provider and OS. | +| general/scripts/aws/\*.py | Scripts, which are executed from fabfiles and AWS-specific. The first part of file name defines to which template this script is related to. For example:
common\_\*.py – can be executed from more than one template.
ssn\_\*.py – are used for SSN template.
edge\_\*.py – are used for Edge template. | +| general/scripts/os/\*.py | Scripts, which are OS independent and can be executed from more than one template. | + +#### Docker actions overview + +Available Docker images and their actions: + +| Docker image | Actions | +|----------------------------------------------|-------------------------------------------------------------------------------| +| ssn | create, terminate | +| edge | create, terminate, status, start, stop, recreate | +| jupyter/rstudio/zeppelin/tensor/deeplearning | create, terminate, start, stop, configure, list_libs, install_libs, git_creds | +| dataengine/dataengine-service | create, terminate | + +##### Docker and python execution workflow on example of SSN node + +- Docker command for building images *docker.dlab-base* and *docker.dlab-ssn*: +``` +sudo docker build --build-arg OS=debian --file general/files/aws/base_Dockerfile -t docker.dlab-base . ; +sudo docker build --build-arg OS=debian --file general/files/aws/ssn_Dockerfile -t docker.dlab-ssn . ; +``` +Example of SSN Docker file: +``` +FROM docker.dlab-base:latest + +ARG OS + +COPY ssn/ /root/ +COPY general/scripts/aws/ssn_* /root/scripts/ +COPY general/lib/os/${OS}/ssn_lib.py /usr/lib/python2.7/dlab/ssn_lib.py +COPY general/files/aws/ssn_policy.json /root/files/ +COPY general/templates/aws/jenkins_jobs /root/templates/jenkins_jobs + +RUN chmod a+x /root/fabfile.py; \ + chmod a+x /root/scripts/* + +RUN mkdir /project_tree +COPY . /project_tree +``` +Using this Docker file, all required scripts and files will be copied to Docker container. + +- Docker command for building SSN: +``` +docker run -i -v /root/KEYNAME.pem:/root/keys/KEYNAME.pem –v /web_app:/root/web_app -e "conf_os_family=debian" -e "conf_cloud_provider=aws" -e "conf_resource=ssn" -e "aws_ssn_instance_size=t2.medium" -e "aws_region=us-west-2" -e "aws_vpc_id=vpc-111111" -e "aws_subnet_id=subnet-111111" -e "aws_security_groups_ids=sg-11111,sg-22222,sg-33333" -e "conf_key_name=KEYNAME" -e "conf_service_base_name=dlab_test" -e "aws_access_key=Access_Key_ID" -e "aws_secret_access_key=Secret_Access_Key" -e "conf_tag_resource_id=dlab" docker.dlab-ssn --action create ; +``` + +- Docker executes *entrypoint.py* script with action *create*. *Entrypoint.py* will set environment variables, which were provided from Docker and execute *general/api/create.py* script: +``` + elif args.action == 'create': + with hide('running'): + local("/bin/create.py") +``` +- *general/api/create.py* will execute Fabric command with *run* action: +``` + try: + local('cd /root; fab run') +``` +- Function *run()* in file *ssn/fabfile.py* will be executed. It will run two scripts *general/scripts/aws/ssn\_prepare.py* and *general/scripts/aws/ssn\_configure.py*: +``` + try: + local("~/scripts/{}.py".format('ssn_prepare')) + except Exception as err: + traceback.print_exc() + append_result("Failed preparing SSN node. Exception: " + str(err)) + sys.exit(1) + + try: + local("~/scripts/{}.py".format('ssn_configure')) + except Exception as err: + traceback.print_exc() + append_result("Failed configuring SSN node. Exception: " + str(err)) + sys.exit(1) +``` +- The scripts *general/scripts//ssn\_prepare.py* an *general/scripts//ssn\_configure.py* will execute other Python scripts/functions for: + 1. *ssn\_prepate.py:* + 1. Creating configuration file (for AWS) + 2. Creating Cloud resources. + 2. *ssn\_configure.py:* + 1. Installing prerequisites + 2. Installing required packages + 3. Configuring Docker + 4. Configuring DLab Web UI + +- If all scripts/function are executed successfully, Docker container will stop and SSN node will be created. + +#### Example of Docker commands + +SSN: + +``` +docker run -i -v .pem:/root/keys/.pem -e "region=" -e "conf_service_base_name=" -e “conf_resource=ssn" -e "aws_access_key=" -e "aws_secret_access_key=" docker.dlab-ssn --action +``` +All parameters are listed in section "Self-ServiceNode" chapter. + +Other images: +``` +docker run -i -v /home//keys:/root/keys -v /opt/dlab/tmp/result:/response -v /var/opt/dlab/log/:/logs/ -e –e docker.dlab- --action +``` + +#### How to add a new template + +First of all, a new directory should be created in *infrastructure-provisioning/src/*. + +For example: *infrastructure-provisioning/src/my-tool/* + +The following scripts/directories are required to be created in the template directory: + + my-tool + ├───scripts + └───fabfile.py + +fabfile.py – the main script, which contains main functions for this template such as run, stop, terminate, etc. + +Here is example of *run*() function for Jupyter Notebook node: + +Path: *infrastructure-provisioning/src/jupyter/fabfile.py* +``` +def run(): + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + notebook_config = dict() + notebook_config['uuid'] = str(uuid.uuid4())[:5] + + try: + params = "--uuid {}".format(notebook_config['uuid']) + local("~/scripts/{}.py {}".format('common_prepare_notebook', params)) + except Exception as err: + traceback.print_exc() + append_result("Failed preparing Notebook node.", str(err)) + sys.exit(1) + + try: + params = "--uuid {}".format(notebook_config['uuid']) + local("~/scripts/{}.py {}".format('jupyter_configure', params)) + except Exception as err: + traceback.print_exc() + append_result("Failed configuring Notebook node.", str(err)) + sys.exit(1) +``` + +This function describes process of creating Jupyter node. It is divided into two parts – prepare and configure. Prepare part is common for all notebook templates and responsible for creating of necessary cloud resources, such as EC2 instances, etc. Configure part describes how the appropriate services will be installed. + +To configure Jupyter node, the script *jupyter\_configure.py* is executed. This script describes steps for configuring Jupyter node. In each step, the appropriate Python script is executed. + +For example: + +Path: *infrastructure-provisioning/src/general/scripts/aws/jupyter\_configure.py* +``` + try: + logging.info('[CONFIGURE JUPYTER NOTEBOOK INSTANCE]') + print('[CONFIGURE JUPYTER NOTEBOOK INSTANCE]') + params = "--hostname {} --keyfile {} --region {} --spark_version {} --hadoop_version {} --os_user {} --scala_version {}".\ + format(instance_hostname, keyfile_name, os.environ['aws_region'], os.environ['notebook_spark_version'], + os.environ['notebook_hadoop_version'], os.environ['conf_os_user'], + os.environ['notebook_scala_version']) + try: + local("~/scripts/{}.py {}".format('configure_jupyter_node', params)) +``` + +In this step, the script *infrastructure-provisioning/src/jupyter/scripts/configure\_jupyter\_node.py* will be executed. + +Example of script *infrastructure-provisioning/src/jupyter/scripts/configure\_jupyter\_node.py:* +``` +if __name__ == "__main__": + print("Configure connections") + env['connection_attempts'] = 100 + env.key_filename = [args.keyfile] + env.host_string = args.os_user + '@' + args.hostname + + print("Configuring notebook server.") + try: + if not exists('/home/' + args.os_user + '/.ensure_dir'): + sudo('mkdir /home/' + args.os_user + '/.ensure_dir') + except: + sys.exit(1) + + print("Mount additional volume") + prepare_disk(args.os_user) + + print("Install Java") + ensure_jre_jdk(args.os_user) +``` + +This script call functions for configuring Jupyter node. If this function is OS dependent, it will be placed in *infrastructure-provisioning/src/general/lib/\/debian/notebook\_lib.py* + +All functions in template directory (e.g. *infrastructure-provisioning/src/my-tool/*) should be OS and cloud independent. + +All OS or cloud dependent functions should be placed in *infrastructure-provisioning/src/general/lib/* directory. + +The following steps are required for each Notebook node: + +- Configure proxy on Notebook instance – the script *infrastructure-provisioning/src/general/scripts/os/notebook\_configure\_proxy.py* +- Installing user’s key – the script *infrastructure-provisioning/src/base/scripts/install\_user\_key.py* + +Other scripts, responsible for configuring Jupyter node are placed in *infrastructure-provisioning/src/jupyter/scripts/* + +- scripts directory – contains all required configuration scripts. + + +- *infrastructure-provisioning/src/general/files//my-tool_Dockerfile* – used for building template Docker image and describes which files, scripts, templates are required and will be copied to template Docker image. +- *infrastructure-provisioning/src/general/files//my-tool_descriptsion.json* – JSON file for DLab Web UI. In this file you can specify: + * exploratory\_environment\_shapes – list of EC2 shapes + * exploratory\_environment\_versions – description of template + +Example of this file for Jupyter node for AWS cloud: +``` +{ + "exploratory_environment_shapes" : + { + "For testing" : [ + {"Size": "S", "Description": "Standard_DS1_v2", "Type": "Standard_DS1_v2","Ram": "3.5 GB","Cpu": "1", "Spot": "true", "SpotPctPrice": "70"} + ], + "Memory optimized" : [ + {"Size": "S", "Description": "Standard_E4s_v3", "Type": "Standard_E4s_v3","Ram": "32 GB","Cpu": "4"}, + {"Size": "M", "Description": "Standard_E16s_v3", "Type": "Standard_E16s_v3","Ram": "128 GB","Cpu": "16"}, + {"Size": "L", "Description": "Standard_E32s_v3", "Type": "Standard_E32s_v3","Ram": "256 GB","Cpu": "32"} + ], + "Compute optimized": [ + {"Size": "S", "Description": "Standard_F2s", "Type": "Standard_F2s","Ram": "4 GB","Cpu": "2"}, + {"Size": "M", "Description": "Standard_F8s", "Type": "Standard_F8s","Ram": "16.0 GB","Cpu": "8"}, + {"Size": "L", "Description": "Standard_F16s", "Type": "Standard_F16s","Ram": "32.0 GB","Cpu": "16"} + ] + }, + "exploratory_environment_versions" : + [ + { + "template_name": "Jupyter notebook 5.7.4", + "description": "Base image with jupyter node creation routines", + "environment_type": "exploratory", + "version": "jupyter_notebook-5.7.4", + "vendor": "Azure" + } + ] +} +``` + +Additionally, following directories could be created: + +- templates – directory for new templates; + +- files – directory for files used by newly added templates only; + +All Docker images are being built while creating SSN node. To add newly created template, add it to the list of images in the +following script: + +Path: *infrastructure-provisioning/src/general/scripts/aws/ssn\_configure.py* +``` + try: + logging.info('[CONFIGURING DOCKER AT SSN INSTANCE]') + print('[CONFIGURING DOCKER AT SSN INSTANCE]') + additional_config = [{"name": "base", "tag": "latest"}, + {"name": "edge", "tag": "latest"}, + {"name": "jupyter", "tag": "latest"}, + {"name": "rstudio", "tag": "latest"}, + {"name": "zeppelin", "tag": "latest"}, + {"name": "tensor", "tag": "latest"}, + {"name": "emr", "tag": "latest"}] +``` +For example: +``` +... + + {"name": "my-tool", "tag": "latest"}, + +... +``` + +## LDAP Authentication + +### Unified logging and group management + +There are a few popular LDAP distributions on the market like Active Directory, Open LDap. That’s why some differences in configuration appear. +Also depending on customization, there might be differences in attributes configuration. For example the DN(distinguished name) may contain different attributes: + +- **DN=CN=Name Surname,OU=groups,OU=EPAM,DC=Company,DC=Cloud** +- **DN=UID=UID#53,OU=groups,OU=Company,DC=Company,DC=Cloud** + +**CN** vs **UID**. + +The relation between users and groups also varies from vendor to vendor. + +For example, in Open LDAP the group object may contain set (from 0 to many) attributes **"memberuid"** with values equal to user`s attribute **“uid”**. + +However, in Active Directory the mappings are done based on other attributes. +On a group size there is attribute **"member"** (from 0 to many values) and its value is user`s **DN** (distinguished name). + + +To fit the unified way of LDAP usage, we introduced configuration file with set of properties and customized scripts (python and JavaScript based). +On backend side, all valuable attributes are further collected and passed to these scripts. +To apply some customization it is required to update a few properties in **security.yml** and customize the scripts. + + +### Properties overview + +There are just a few properties based in which the customization could be done: +- **ldapBindTemplate: uid=%s,ou=People,dc=example,dc=com** +- **ldapBindAttribute: uid** +- **ldapSearchAttribute: uid** + +Where the: +- **ldapBindTemplate** is a user`s DN template which should be filed with custom value. Here the template could be changed: uid=%s,ou=People,dc=example,dc=com -> cn=%s,ou=People,dc=example,dc=com. +- **ldapBindAttribute** - this is a major attribute, on which the DN is based on. Usually it is any of: uid or cn, or email. +- **ldapSearchAttribute** - another attribute, based on which users will be looked up in LDAP. + +Additional parameters that are populated during deployment and may be changed in future are: +- **ldapConnectionConfig.name: ldap user name** +- **ldapConnectionConfig.ldapHost: ldap host** +- **ldapConnectionConfig.ldapPort: ldap port** +- **ldapConnectionConfig.credentials: ldap credentials** + +### Scripts overview + +There are 3 scripts in security.yml: +- **userLookUp** (python based) - responsible for user lookup in LDap and returns additional user`s attributes; +- **userInfo** (python based) - enriches user with additional data; +- **groupInfo** (javascript based) – responsible for mapping between users and groups; + +### Script structure + +The scripts above were created to flexibly manage user`s security configuration. They all are part of **security.yml** configuration. All scripts have following structure: + - **name** + - **cache** + - **expirationTimeMsec** + - **scope** + - **attributes** + - **timeLimit** + - **base** + - **filter** + - **searchResultProcessor:** + - **language** + - **code** + +Major properties are: +- **attributes** - list of attributes that will be retrieved from LDAP (-name, -cn, -uid, -member, etc); +- **filter** - the filter, based on which the object will be retrieved from LDAP; +- **searchResultProcessor** - optional. If only LDAP object attributes retrieving is required, this property should be empty. For example, “userLookup” script only retrieves list of "attributes". Otherwise, code customization (like user enrichment, user to groups matching, etc.) should be added into sub-properties below: + - **language** - the script language - "python" or "JavaScript" + - **code** - the script code. + + +### "userLookUp" script + +Configuration properties: + +- **ldapBindTemplate: 'cn=%s,ou=users,ou=alxn,dc=alexion,dc=cloud'** +- **ldapBindAttribute: cn** +- **ldapSearchAttribute: mail** + +Script code: + + name: userLookUp + cache: true + expirationTimeMsec: 600000 + scope: SUBTREE + attributes: + - cn + - gidNumber + - mail + - memberOf + timeLimit: 0 + base: ou=users,ou=alxn,dc=alexion,dc=cloud + filter: "(&(objectCategory=person)(objectClass=user)(mail=%mail%))" + +In the example above, the user login passed from GUI is a mail (**ldapSearchAttribute: mail**) and based on the filer (**filter: "(&(objectCategory=person)(objectClass=user)(mail=%mail%))")** so, the service would search user by its **“mail”**. +If corresponding users are found - the script will return additional user`s attributes: + - cn + - gidNumber + - mail + - memberOf + +User`s authentication into LDAP would be done for DN with following template **ldapBindTemplate: 'cn=%s,ou=users,ou=alxn,dc=alexion,dc=cloud'**, where CN is attribute retrieved by **“userLookUp”** script. + +## Azure OAuth2 Authentication +DLab supports OAuth2 authentication that is configured automatically in Security Service and Self Service after DLab deployment. +Please see explanation details about configuration parameters for Self Service and Security Service below. +DLab supports client credentials(username + password) and authorization code flow for authentication. + + +### Azure OAuth2 Self Service configuration + + azureLoginConfiguration: + useLdap: false + tenant: xxxx-xxxx-xxxx-xxxx + authority: https://login.microsoftonline.com/ + clientId: xxxx-xxxx-xxxx-xxxx + redirectUrl: https://dlab.azure.cloudapp.azure.com/ + responseMode: query + prompt: consent + silent: true + loginPage: https://dlab.azure.cloudapp.azure.com/ + maxSessionDurabilityMilliseconds: 288000000 + +where: +- **useLdap** - defines if LDAP authentication is enabled(true/false). If false Azure OAuth2 takes place with configuration properties below +- **tenant** - tenant id of your company +- **authority** - Microsoft login endpoint +- **clientId** - id of the application that users log in through +- **redirectUrl** - redirect URL to DLab application after try to login to Azure using OAuth2 +- **responseMode** - defines how Azure sends authorization code or error information to DLab during log in procedure +- **prompt** - defines kind of prompt during Oauth2 login +- **silent** - defines if DLab tries to log in user without interaction(true/false), if false DLab tries to login user with configured prompt +- **loginPage** - start page of DLab application +- **maxSessionDurabilityMilliseconds** - max user session durability. user will be asked to login after this period of time and when he/she creates ot starts notebook/cluster. This operation is needed to update refresh_token that is used by notebooks to access Data Lake Store + +To get more info about *responseMode*, *prompt* parameters please visit [Authorize access to web applications using OAuth 2.0 and Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-protocols-oauth-code) + + +### Azure OAuth2 Security Service configuration + + azureLoginConfiguration: + useLdap: false + tenant: xxxx-xxxx-xxxx-xxxx + authority: https://login.microsoftonline.com/ + clientId: xxxx-xxxx-xxxx-xxxx + redirectUrl: https://dlab.azure.cloudapp.azure.com/ + validatePermissionScope: true + permissionScope: subscriptions/xxxx-xxxx-xxxx-xxxx/resourceGroups/xxxx-xxxx/providers/Microsoft.DataLakeStore/accounts/xxxx/providers/Microsoft.Authorization/ + managementApiAuthFile: /dlab/keys/azure_authentication.json + +where: +- **useLdap** - defines if LDAP authentication is enabled(true/false). If false Azure OAuth2 takes place with configuration properties below +- **tenant** - tenant id of your company +- **authority** - Microsoft login endpoint +- **clientId** - id of the application that users log in through +- **redirectUrl** - redirect URL to DLab application after try to login to Azure using OAuth2 +- **validatePermissionScope** - defines(true/false) if user's permissions should be validated to resource that is provided in permissionScope parameter. User will be logged in onlu in case he/she has any role in resource IAM described with permissionScope parameter +- **permissionScope** - describes Azure resource where user should have any role to pass authentication. If user has no role in resource IAM he/she will not be logged in +- **managementApiAuthFile** - authentication file that is used to query Microsoft Graph API to check user roles in resource described in permissionScope + From 415f3123752e030887db21db61bfd646bc39ce16 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 2 Jul 2019 16:46:31 +0300 Subject: [PATCH 245/357] [DLAB-827]: unify scrollers --- .../administration/roles/roles.component.scss | 60 +++++++++++++++++-- .../webapp/src/assets/styles/_theme.scss | 1 + 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss index aee43a38ef..aef38c3685 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss @@ -17,7 +17,9 @@ * under the License. */ -::ng-deep .mat-option:first-child .mat-pseudo-checkbox { display: none; } +::ng-deep .mat-option:first-child .mat-pseudo-checkbox { + display: none; +} .caret { width: 40px; @@ -31,6 +33,7 @@ height: 36px; line-height: 1; cursor: pointer; + &.not-allowed { background-color: #dcdcdc; } @@ -41,12 +44,15 @@ height: 85vh; overflow-y: auto; } + .no-details { color: #d8d8d8; } + .stepper { height: 190px; margin-top: 10px; + .inner-step { height: 70px; padding: 5px; @@ -54,16 +60,19 @@ justify-content: center; flex-direction: column; text-align: center; + input { width: 490px; align-self: center; } + .caret { i { margin-top: 3px; } } } + .text-center { button { &:not(:last-child) { @@ -72,6 +81,7 @@ } } } + .selector-wrapper { display: flex; align-self: center; @@ -82,37 +92,47 @@ font-size: 15px; font-weight: 300; box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + mat-form-field { width: 100%; + .mat-form-field-wrapper { padding-bottom: 0; } + .mat-icon { font-size: 20px; } } + .dropdown-multiselect { width: 100% !important; - > button { + + >button { padding: 6px 22px; } } } + .list-header { padding: 0 15px; } + .scrolling-content { max-height: 450px; overflow-x: hidden; overflow-y: auto; display: block; padding: 15px 5px; + &.stepper-opened { height: 250px; } } + .roles { width: 30%; + .selector-wrapper-edit { position: relative; display: flex; @@ -121,14 +141,17 @@ padding-left: 10px; background: #fff; box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + multi-select-dropdown { width: 100%; + .dropdown-multiselect { - > button { + >button { padding: 8px 22px 5px; } } } + .caret { &:hover { box-shadow: 0 3px 1px -10px rgba(0, 0, 0, 0.2), 0 2px 1px 0 rgba(0, 0, 0, 0.17), 0 1px 5px 0 rgba(0, 0, 0, 0.12) @@ -136,13 +159,16 @@ } } } + .groups { width: 20%; } + .users { width: 30%; padding: 0 10px; } + .users-list { padding: 5px 10px; font-family: 'Open Sans', sans-serif; @@ -150,11 +176,13 @@ font-weight: 300; color: #577289; position: relative; + i { color: #FF5722; font-size: 18px; cursor: pointer; } + .list-selected { width: 100%; margin-top: 50px; @@ -163,21 +191,25 @@ overflow: hidden; } } + .expanded-panel { display: flex; align-items: flex-end; + .add-input-block { display: flex; height: 36px; padding-right: 0; outline: none; box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + input { height: 36px; padding: 0; padding-left: 10px; width: 170px; } + .caret { width: 50px; } @@ -198,6 +230,7 @@ mat-expansion-panel-header { .mat-step-icon { background-color: #36afd5 !important; } + .mat-step-label { font-family: 'Open Sans', sans-serif; font-size: 16px; @@ -210,10 +243,12 @@ mat-expansion-panel-header { .actions { padding: 10px 0; } + &.filter-row { .actions { button { background: none; + .mid { vertical-align: sub; } @@ -221,13 +256,14 @@ mat-expansion-panel-header { } } } + .th_actions { width: 10%; } } .mat-chip:not(.mat-basic-chip) { - transition: box-shadow 280ms cubic-bezier(.4,0,.2,1); + transition: box-shadow 280ms cubic-bezier(.4, 0, .2, 1); padding: 7px 0 7px 10px; border-radius: 24px; cursor: default; @@ -239,10 +275,12 @@ mat-expansion-panel-header { overflow: hidden; text-overflow: ellipsis; } + mat-chip.mat-chip a { position: absolute; right: 15px; } + mat-form-field.chip-list { &.mat-form-field { position: absolute; @@ -260,9 +298,11 @@ mat-form-field.chip-list { } } } + .multiple-select { border-bottom: 1px solid #dedbdb; padding: 0; + a { display: inline-block; width: 50%; @@ -270,14 +310,17 @@ mat-form-field.chip-list { vertical-align: middle; color: #575757; cursor: pointer; + i { vertical-align: sub; font-size: 20px; } + &:hover { color: #4eaf3e; background: #f9fafb; } + &.deselect { &:hover { color: #f1696e; @@ -288,29 +331,36 @@ mat-form-field.chip-list { table { width: 100%; + .name { width: 15%; } + .roles { width: 30%; } + .users { width: 40%; } + .actions { color: #607d8b; width: 10%; text-align: center; + span { transition: all .5s ease-in-out; cursor: pointer; + .mat-icon { font-size: 18px; padding-top: 12px; } + &:hover { color: darken(#607d8b, 10%); } } } -} \ No newline at end of file +} diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 49458799da..9c1621ca4f 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -372,6 +372,7 @@ span.mat-slide-toggle-content { .mat-chip { background-color: rgba(47, 174, 215, 0.2) !important; color: #687e96; + max-width: 385px !important; } .roles { From aa88485b198409266fafafcbba206fdd20cc143c Mon Sep 17 00:00:00 2001 From: Dyoma33 Date: Tue, 2 Jul 2019 16:59:56 +0300 Subject: [PATCH 246/357] [DLAB-810] Truned off proxy buffering in nginx --- infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf b/infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf index ff997eb0e8..dd9d035c7a 100644 --- a/infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf +++ b/infrastructure-provisioning/src/ssn/templates/ssn_nginx.conf @@ -40,6 +40,7 @@ http { sendfile on; tcp_nopush on; tcp_nodelay on; + proxy_buffering off; keepalive_timeout 65; types_hash_max_size 2048; From 5fed1d452bf3259b20c0d2a080b355cc3162d82f Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 2 Jul 2019 17:09:00 +0300 Subject: [PATCH 247/357] DLAB-833 added API for activating/deactivating project --- ...erminateDTO.java => ProjectActionDTO.java} | 2 +- .../backendapi/resources/ProjectResource.java | 20 +++++++++- .../backendapi/service/ProjectService.java | 9 ++++- .../service/impl/ProjectServiceImpl.java | 30 ++++++++++----- .../dlab/backendapi/domain/EndpointDTO.java | 2 + .../dlab/backendapi/domain/ProjectDTO.java | 7 +++- .../backendapi/resources/ProjectResource.java | 37 +++++++++++++++++++ .../resources/dto/ProjectActionFormDTO.java | 10 +++++ .../backendapi/service/ProjectService.java | 2 + .../impl/InfrastructureInfoServiceBase.java | 6 +-- .../service/impl/ProjectServiceImpl.java | 24 +++++++++--- 11 files changed, 126 insertions(+), 23 deletions(-) rename services/dlab-model/src/main/java/com/epam/dlab/dto/project/{ProjectTerminateDTO.java => ProjectActionDTO.java} (77%) create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectActionFormDTO.java diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectActionDTO.java similarity index 77% rename from services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java rename to services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectActionDTO.java index 533e342d9b..1634c11a28 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectTerminateDTO.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectActionDTO.java @@ -7,7 +7,7 @@ @Data @AllArgsConstructor -public class ProjectTerminateDTO extends ResourceBaseDTO { +public class ProjectActionDTO extends ResourceBaseDTO { @JsonProperty("project_name") private final String name; } diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java index fa7aee13e5..005ad9f8e4 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -2,8 +2,8 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.dto.project.ProjectActionDTO; import com.epam.dlab.dto.project.ProjectCreateDTO; -import com.epam.dlab.dto.project.ProjectTerminateDTO; import com.google.inject.Inject; import io.dropwizard.auth.Auth; @@ -35,7 +35,23 @@ public Response createProject(@Auth UserInfo userInfo, ProjectCreateDTO dto) { @POST @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public Response terminateProject(@Auth UserInfo userInfo, ProjectTerminateDTO dto) { + public Response terminateProject(@Auth UserInfo userInfo, ProjectActionDTO dto) { return Response.ok(projectService.terminate(userInfo, dto)).build(); } + + @Path("/start") + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public Response startProject(@Auth UserInfo userInfo, ProjectActionDTO dto) { + return Response.ok(projectService.start(userInfo, dto)).build(); + } + + @Path("/stop") + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public Response stopProject(@Auth UserInfo userInfo, ProjectActionDTO dto) { + return Response.ok(projectService.stop(userInfo, dto)).build(); + } } diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index b18aa8c83a..65d4b70db3 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -1,11 +1,16 @@ package com.epam.dlab.backendapi.service; import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.dto.project.ProjectActionDTO; import com.epam.dlab.dto.project.ProjectCreateDTO; -import com.epam.dlab.dto.project.ProjectTerminateDTO; public interface ProjectService { String create(UserInfo userInfo, ProjectCreateDTO projectCreateDTO); - String terminate(UserInfo userInfo, ProjectTerminateDTO dto); + + String terminate(UserInfo userInfo, ProjectActionDTO dto); + + String start(UserInfo userInfo, ProjectActionDTO dto); + + String stop(UserInfo userInfo, ProjectActionDTO dto); } diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 4eebcfc30d..c0a1335949 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -8,8 +8,8 @@ import com.epam.dlab.backendapi.core.response.handlers.ProjectCallbackHandler; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.dto.ResourceBaseDTO; +import com.epam.dlab.dto.project.ProjectActionDTO; import com.epam.dlab.dto.project.ProjectCreateDTO; -import com.epam.dlab.dto.project.ProjectTerminateDTO; import com.epam.dlab.rest.client.RESTService; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.inject.Inject; @@ -18,6 +18,7 @@ @Slf4j public class ProjectServiceImpl implements ProjectService { private static final String PROJECT_IMAGE = "docker.dlab-project"; + private static final String EDGE_IMAGE = "docker.dlab-edge"; @Inject protected RESTService selfService; @Inject @@ -33,15 +34,26 @@ public class ProjectServiceImpl implements ProjectService { @Override public String create(UserInfo userInfo, ProjectCreateDTO dto) { - return executeDocker(userInfo, dto, DockerAction.CREATE, dto.getName()); + return executeDocker(userInfo, dto, DockerAction.CREATE, dto.getName(), "project", PROJECT_IMAGE); } @Override - public String terminate(UserInfo userInfo, ProjectTerminateDTO dto) { - return executeDocker(userInfo, dto, DockerAction.TERMINATE, dto.getName()); + public String terminate(UserInfo userInfo, ProjectActionDTO dto) { + return executeDocker(userInfo, dto, DockerAction.TERMINATE, dto.getName(), "project", PROJECT_IMAGE); } - private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerAction action, String projectName) { + @Override + public String start(UserInfo userInfo, ProjectActionDTO dto) { + return executeDocker(userInfo, dto, DockerAction.START, dto.getName(), "edge", EDGE_IMAGE); + } + + @Override + public String stop(UserInfo userInfo, ProjectActionDTO dto) { + return executeDocker(userInfo, dto, DockerAction.STOP, dto.getName(), "edge", EDGE_IMAGE); + } + + private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerAction action, String projectName, + String resourceType, String image) { String uuid = DockerCommands.generateUUID(); folderListenerExecutor.start(configuration.getKeyLoaderDirectory(), @@ -51,14 +63,14 @@ private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerActio RunDockerCommand runDockerCommand = new RunDockerCommand() .withInteractive() - .withName(String.join("_", projectName, "project")) + .withName(String.join("_", projectName, resourceType)) .withVolumeForRootKeys(configuration.getKeyDirectory()) .withVolumeForResponse(configuration.getKeyLoaderDirectory()) - .withVolumeForLog(configuration.getDockerLogDirectory(), "project") - .withResource("project") + .withVolumeForLog(configuration.getDockerLogDirectory(), resourceType) + .withResource(resourceType) .withRequestId(uuid) .withConfKeyName(configuration.getAdminKey()) - .withImage(PROJECT_IMAGE) + .withImage(image) .withAction(action); try { diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java index 15c2f1853c..e2cdfb3bb6 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java @@ -1,6 +1,7 @@ package com.epam.dlab.backendapi.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; @Data @@ -10,5 +11,6 @@ public class EndpointDTO { private final String name; private final String url; private final String account; + @JsonProperty("endpoint_tag") private final String tag; } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 2305774b26..235485766f 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -29,7 +29,12 @@ public class ProjectDTO { public enum Status { CREATING, ACTIVE, - FAILED, TERMINATED, TERMINATING; + FAILED, + TERMINATED, + TERMINATING, + STOPPING, + STARTING, + STOPPED; public static Status from(UserInstanceStatus userInstanceStatus) { if (userInstanceStatus == UserInstanceStatus.RUNNING) { diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java index 3a2b3fff9a..d6986cddd9 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -3,6 +3,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.domain.UpdateProjectBudgetDTO; +import com.epam.dlab.backendapi.resources.dto.ProjectActionFormDTO; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.rest.dto.ErrorDTO; import com.google.inject.Inject; @@ -61,6 +62,42 @@ public Response createProject(@Parameter(hidden = true) @Auth UserInfo userInfo, .build(); } + @Operation(summary = "Start project", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "202", description = "Project is starting"), + @ApiResponse(responseCode = "400", description = "Validation error", content = @Content(mediaType = + MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @Path("start") + @POST + @Consumes(MediaType.APPLICATION_JSON) + public Response startProject(@Parameter(hidden = true) @Auth UserInfo userInfo, + @Valid ProjectActionFormDTO startProjectDto) { + projectService.start(userInfo, startProjectDto.getProjectName()); + return Response + .accepted() + .build(); + } + + @Operation(summary = "Stop project", tags = "project") + @ApiResponses({ + @ApiResponse(responseCode = "202", description = "Project is stopping"), + @ApiResponse(responseCode = "400", description = "Validation error", content = @Content(mediaType = + MediaType.APPLICATION_JSON, + schema = @Schema(implementation = ErrorDTO.class))) + }) + @Path("stop") + @POST + @Consumes(MediaType.APPLICATION_JSON) + public Response stopProject(@Parameter(hidden = true) @Auth UserInfo userInfo, + @Valid ProjectActionFormDTO startProjectDto) { + projectService.stop(userInfo, startProjectDto.getProjectName()); + return Response + .accepted() + .build(); + } + @Operation(summary = "Get project info", tags = "project") @ApiResponses({ diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectActionFormDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectActionFormDTO.java new file mode 100644 index 0000000000..ac3a56171d --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectActionFormDTO.java @@ -0,0 +1,10 @@ +package com.epam.dlab.backendapi.resources.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +public class ProjectActionFormDTO { + @JsonProperty("project_name") + private final String projectName; +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index 4c15d59110..124e60927c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -15,6 +15,8 @@ public interface ProjectService { ProjectDTO get(String name); void terminate(UserInfo userInfo, String name); + void start(UserInfo userInfo, String name); + void stop(UserInfo userInfo, String name); void update(ProjectDTO projectDTO); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java index 919a5fc749..3ba548e9d5 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java @@ -33,7 +33,6 @@ import com.epam.dlab.dto.base.edge.EdgeInfo; import com.epam.dlab.exceptions.DlabException; import com.google.inject.Inject; -import com.jcabi.manifests.Manifests; import lombok.extern.slf4j.Slf4j; import org.bson.Document; @@ -96,13 +95,14 @@ public HealthStatusPageDTO getHeathStatus(UserInfo userInfo, boolean fullReport, @Override public InfrastructureMetaInfoDTO getInfrastructureMetaInfo() { - final String branch = Manifests.read("GIT-Branch"); + /*final String branch = Manifests.read("GIT-Branch"); return InfrastructureMetaInfoDTO.builder() .branch(branch) .commit(Manifests.read("GIT-Commit")) .version(Manifests.read("DLab-Version")) .releaseNotes(String.format(RELEASE_NOTES_FORMAT, branch)) - .build(); + .build();*/ + return InfrastructureMetaInfoDTO.builder().build(); } protected abstract Map getSharedInfo(T sharedInfo); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 89709398e6..f401563def 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -8,8 +8,8 @@ import com.epam.dlab.backendapi.service.EnvironmentService; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.constants.ServiceConsts; +import com.epam.dlab.dto.project.ProjectActionDTO; import com.epam.dlab.dto.project.ProjectCreateDTO; -import com.epam.dlab.dto.project.ProjectTerminateDTO; import com.epam.dlab.exceptions.ResourceConflictException; import com.epam.dlab.exceptions.ResourceNotFoundException; import com.epam.dlab.rest.client.RESTService; @@ -29,6 +29,8 @@ public class ProjectServiceImpl implements ProjectService { private static final String CREATE_PRJ_API = "infrastructure/project/create"; private static final String TERMINATE_PRJ_API = "infrastructure/project/terminate"; + private static final String START_PRJ_API = "infrastructure/project/start"; + private static final String STOP_PRJ_API = "infrastructure/project/stop"; private final ProjectDAO projectDAO; private final EnvironmentService environmentService; private final UserGroupDao userGroupDao; @@ -75,11 +77,23 @@ public ProjectDTO get(String name) { @Override public void terminate(UserInfo userInfo, String name) { - terminateProjectOnCloud(userInfo, name); + projectActionOnCloud(userInfo, name, TERMINATE_PRJ_API); environmentService.terminateProjectEnvironment(name); projectDAO.updateStatus(name, ProjectDTO.Status.TERMINATING); } + @Override + public void start(UserInfo userInfo, String name) { + projectActionOnCloud(userInfo, name, START_PRJ_API); + projectDAO.updateStatus(name, ProjectDTO.Status.STARTING); + } + + @Override + public void stop(UserInfo userInfo, String name) { + projectActionOnCloud(userInfo, name, STOP_PRJ_API); + projectDAO.updateStatus(name, ProjectDTO.Status.STOPPING); + } + @Override public void update(ProjectDTO projectDTO) { if (!projectDAO.update(projectDTO)) { @@ -116,10 +130,10 @@ private void createProjectOnCloud(UserInfo user, ProjectDTO projectDTO) { } - private void terminateProjectOnCloud(UserInfo user, String projectName) { + private void projectActionOnCloud(UserInfo user, String projectName, String provisioningApiUri) { try { - String uuid = provisioningService.post(TERMINATE_PRJ_API, user.getAccessToken(), - new ProjectTerminateDTO(projectName), String.class); + String uuid = provisioningService.post(provisioningApiUri, user.getAccessToken(), + new ProjectActionDTO(projectName), String.class); requestId.put(user.getName(), uuid); } catch (Exception e) { log.error("Can not terminate project due to: {}", e.getMessage()); From a09aa4304a6f7bd798373540eb3714b089f46529 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 17:10:18 +0300 Subject: [PATCH 248/357] collapsing test --- README.md | 205 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 124 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index 29e581443e..e98a971012 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,33 @@ Creation of self-service node – is the first step for deploying DLab. SSN is a Elastic(Static) IP address is assigned to an SSN Node, so you are free to stop|start it and and SSN node's IP address won’t change. +## Edge node + +Setting up Edge node is the first step that user is asked to do once logged into DLab. This node is used as proxy server and SSH gateway for the user. Through Edge node users can access Notebook via HTTP and SSH. Edge Node has a Squid HTTP web proxy pre-installed. + +## Notebook node + +The next step is setting up a Notebook node (or a Notebook server). It is a server with pre-installed applications and libraries for data processing, data cleaning and transformations, numerical simulations, statistical modeling, machine learning, etc. Following analytical tools are currently supported in DLab and can be installed on a Notebook node: + +- Jupyter +- RStudio +- Apache Zeppelin +- TensorFlow + Jupyter +- Deep Learning + Jupyter + +Apache Spark is also installed for each of the analytical tools above. + +**Note:** terms 'Apache Zeppelin' and 'Apache Spark' hereinafter may be referred to as 'Zeppelin' and 'Spark' respectively or may have original reference. + +## Data engine cluster + +After deploying Notebook node, user can create one of the cluster for it: +- Data engine - Spark standalone cluster +- Data engine service - cloud managed cluster platform (EMR for AWS or Dataproc for GCP) +That simplifies running big data frameworks, such as Apache Hadoop and Apache Spark to process and analyze vast amounts of data. Adding cluster is not mandatory and is only needed in case additional computational resources are required for job execution. +---------------------- +# DLab Deployment + ### Structure of main DLab directory DLab’s SSN node main directory structure is as follows: @@ -172,33 +199,6 @@ These directories contain the log files for each template and for DLab back-end - selfservice.log – Self-Service log file; - edge, notebook, dataengine, dataengine-service – contains logs of Python scripts. -## Edge node - -Setting up Edge node is the first step that user is asked to do once logged into DLab. This node is used as proxy server and SSH gateway for the user. Through Edge node users can access Notebook via HTTP and SSH. Edge Node has a Squid HTTP web proxy pre-installed. - -## Notebook node - -The next step is setting up a Notebook node (or a Notebook server). It is a server with pre-installed applications and libraries for data processing, data cleaning and transformations, numerical simulations, statistical modeling, machine learning, etc. Following analytical tools are currently supported in DLab and can be installed on a Notebook node: - -- Jupyter -- RStudio -- Apache Zeppelin -- TensorFlow + Jupyter -- Deep Learning + Jupyter - -Apache Spark is also installed for each of the analytical tools above. - -**Note:** terms 'Apache Zeppelin' and 'Apache Spark' hereinafter may be referred to as 'Zeppelin' and 'Spark' respectively or may have original reference. - -## Data engine cluster - -After deploying Notebook node, user can create one of the cluster for it: -- Data engine - Spark standalone cluster -- Data engine service - cloud managed cluster platform (EMR for AWS or Dataproc for GCP) -That simplifies running big data frameworks, such as Apache Hadoop and Apache Spark to process and analyze vast amounts of data. Adding cluster is not mandatory and is only needed in case additional computational resources are required for job execution. ----------------------- -# DLab Deployment - ## Self-Service Node ### Preparing environment for DLab deployment @@ -206,69 +206,112 @@ That simplifies running big data frameworks, such as Apache Hadoop and Apache Sp Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. -#### In Amazon cloud +
#### In Amazon cloud Prerequisites: - SSH key for EC2 instances. This key could be created through Amazon Console. - IAM user - AWS access key ID and secret access key + - VPC ID + - Subnet ID - The following permissions should be assigned for IAM user: ``` { - "Version": "2012-10-17", - "Statement": [ - { - "Action": [ - "iam:ListRoles", - "iam:CreateRole", - "iam:CreateInstanceProfile", - "iam:PutRolePolicy", - "iam:AddRoleToInstanceProfile", - "iam:PassRole", - "iam:GetInstanceProfile", - "iam:ListInstanceProfilesForRole", - "iam:RemoveRoleFromInstanceProfile", - "iam:DeleteInstanceProfile" - ], - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": [ - "ec2:DescribeImages", - "ec2:CreateTags", - "ec2:DescribeRouteTables", - "ec2:CreateRouteTable", - "ec2:AssociateRouteTable", - "ec2:DescribeVpcEndpoints", - "ec2:CreateVpcEndpoint", - "ec2:ModifyVpcEndpoint", - "ec2:DescribeInstances", - "ec2:RunInstances", - "ec2:DescribeAddresses", - "ec2:AllocateAddress", - "ec2:DescribeInstances", - "ec2:AssociateAddress", - "ec2:DisassociateAddress", - "ec2:ReleaseAddress", - "ec2:TerminateInstances" - ], - "Effect": "Allow", - "Resource": "*" - }, - { - "Action": [ - "s3:ListAllMyBuckets", - "s3:CreateBucket", - "s3:PutBucketTagging", - "s3:GetBucketTagging" - ], - "Effect": "Allow", - "Resource": "*" - } - ] + "Version": "2012-10-17", + "Statement": [ + { + "Action": [ + "iam:CreatePolicy", + "iam:AttachRolePolicy", + "iam:DetachRolePolicy", + "iam:DeletePolicy", + "iam:DeleteRolePolicy", + "iam:GetRolePolicy", + "iam:GetPolicy", + "iam:GetUser", + "iam:ListUsers", + "iam:ListAccessKeys", + "iam:ListUserPolicies", + "iam:ListAttachedRolePolicies", + "iam:ListPolicies", + "iam:ListRolePolicies", + "iam:ListRoles", + "iam:CreateRole", + "iam:CreateInstanceProfile", + "iam:PutRolePolicy", + "iam:AddRoleToInstanceProfile", + "iam:PassRole", + "iam:GetInstanceProfile", + "iam:ListInstanceProfilesForRole", + "iam:RemoveRoleFromInstanceProfile", + "iam:DeleteInstanceProfile", + "iam:ListInstanceProfiles", + "iam:DeleteRole", + "iam:GetRole" + ], + "Effect": "Allow", + "Resource": "*" + }, + { + "Action": [ + "ec2:AuthorizeSecurityGroupEgress", + "ec2:AuthorizeSecurityGroupIngress", + "ec2:DeleteRouteTable", + "ec2:DeleteSubnet", + "ec2:DeleteTags", + "ec2:DescribeSubnets", + "ec2:DescribeVpcs", + "ec2:DescribeInstanceStatus", + "ec2:ModifyInstanceAttribute", + "ec2:RevokeSecurityGroupIngress", + "ec2:DescribeImages", + "ec2:CreateTags", + "ec2:DescribeRouteTables", + "ec2:CreateRouteTable", + "ec2:AssociateRouteTable", + "ec2:DescribeVpcEndpoints", + "ec2:CreateVpcEndpoint", + "ec2:ModifyVpcEndpoint", + "ec2:DescribeInstances", + "ec2:RunInstances", + "ec2:DescribeAddresses", + "ec2:AllocateAddress", + "ec2:AssociateAddress", + "ec2:DisassociateAddress", + "ec2:ReleaseAddress", + "ec2:TerminateInstances", + "ec2:AuthorizeSecurityGroupIngress", + "ec2:AuthorizeSecurityGroupEgress", + "ec2:DescribeSecurityGroups", + "ec2:CreateSecurityGroup", + "ec2:DeleteSecurityGroup", + "ec2:RevokeSecurityGroupEgress" + + ], + "Effect": "Allow", + "Resource": "*" + }, + { + "Action": [ + "s3:GetBucketLocation", + "s3:PutBucketPolicy", + "s3:GetBucketPolicy", + "s3:DeleteBucket", + "s3:DeleteObject", + "s3:GetObject", + "s3:ListBucket", + "s3:PutEncryptionConfiguration" + "s3:ListAllMyBuckets", + "s3:CreateBucket", + "s3:PutBucketTagging", + "s3:GetBucketTagging" + ], + "Effect": "Allow", + "Resource": "*" + } + ] } ``` @@ -280,7 +323,7 @@ Preparation steps for deployment: - AMI - Ubuntu 16.04 - IAM role with [policy](#AWS_SSN_policy) should be assigned to the instance - Put SSH key file created through Amazon Console on the instance with the same name -- Install Git and clone DLab repository +- Install Git and clone DLab repository
#### In Azure cloud From 75f2f762b3326784b3ead9c28e221424b642a765 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 17:12:22 +0300 Subject: [PATCH 249/357] collapsing test 1 --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e98a971012..868730017b 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ These directories contain the log files for each template and for DLab back-end Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. -
#### In Amazon cloud +
In Amazon cloud Prerequisites: @@ -325,7 +325,7 @@ Preparation steps for deployment: - Put SSH key file created through Amazon Console on the instance with the same name - Install Git and clone DLab repository
-#### In Azure cloud +
In Azure cloud Prerequisites: @@ -336,9 +336,9 @@ Prerequisites: - Windows Azure Active Directory - Microsoft Graph -- Windows Azure Service Management API +- Windows Azure Service Management API
-#### In Google cloud (GCP) +
In Google cloud (GCP) Prerequisites: @@ -352,7 +352,7 @@ Preparation steps for deployment: - Boot disk OS Image - Ubuntu 16.04 - Generate SSH key pair and rename private key with .pem extension - Put JSON auth file created through Google cloud console to users home directory -- Install Git and clone DLab repository +- Install Git and clone DLab repository ### Executing deployment script From a9f24762f99a5234e0be4ccb2ceaafd18b619625 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 17:15:05 +0300 Subject: [PATCH 250/357] collapsing test 2 --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 868730017b..d51dc33538 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ Prerequisites: - Microsoft Graph - Windows Azure Service Management API
-
In Google cloud (GCP) +
In Google cloud (GCP) Prerequisites: @@ -352,7 +352,7 @@ Preparation steps for deployment: - Boot disk OS Image - Ubuntu 16.04 - Generate SSH key pair and rename private key with .pem extension - Put JSON auth file created through Google cloud console to users home directory -- Install Git and clone DLab repository
 +- Install Git and clone DLab repository
### Executing deployment script @@ -377,7 +377,7 @@ pip install fabric==1.14.0 This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. -#### In Amazon cloud +
In Amazon cloud ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXXXX --aws_region xx-xxxxx-x --conf_os_family debian --conf_cloud_provider aws --aws_vpc_id vpc-xxxxx --aws_subnet_id subnet-xxxxx --aws_security_groups_ids sg-xxxxx,sg-xxxx --key_path /path/to/key/ --conf_key_name key_name --conf_tag_resource_id dlab --aws_account_id xxxxxxxx --aws_billing_bucket billing_bucket --aws_report_path /billing/directory/ --action create @@ -424,9 +424,9 @@ After SSN node deployment following AWS resources will be created: - Security Group for SSN node (if it was specified, script will attach the provided one) - VPC, Subnet (if they have not been specified) for SSN and EDGE nodes - S3 bucket – its name will be \-ssn-bucket. This bucket will contain necessary dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) -- S3 bucket for for collaboration between Dlab users. Its name will be \-shared-bucket +- S3 bucket for for collaboration between Dlab users. Its name will be \-shared-bucket
-#### In Azure cloud +
In Azure cloud ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --azure_region westus2 --conf_os_family debian --conf_cloud_provider azure --azure_vpc_name vpc-test --azure_subnet_name subnet-test --azure_security_group_name sg-test1,sg-test2 --key_path /root/ --conf_key_name Test --azure_auth_path /dir/file.json --action create @@ -497,9 +497,9 @@ After SSN node deployment following Azure resources will be created: - Virtual network and Subnet (if they have not been specified) for SSN and EDGE nodes - Storage account and blob container for necessary further dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) - Storage account and blob container for collaboration between Dlab users -- If support of Data Lake is enabled: Data Lake and shared directory will be created +- If support of Data Lake is enabled: Data Lake and shared directory will be created
-#### In Google cloud (GCP) +
In Google cloud (GCP) ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xxx-xxxxx-x --conf_os_family debian --conf_cloud_provider gcp --key_path /path/to/key/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create @@ -535,7 +535,7 @@ After SSN node deployment following GCP resources will be created: - Security Groups for SSN node (if it was specified, script will attach the provided one) - VPC, Subnet (if they have not been specified) for SSN and EDGE nodes - Bucket – its name will be \-ssn-bucket. This bucket will contain necessary dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) -- Bucket for for collaboration between Dlab users. Its name will be \-shared-bucket +- Bucket for for collaboration between Dlab users. Its name will be \-shared-bucket
### Terminating Self-Service Node From 7394ef0ff3bdb1d6e6bafd791915c6c3bda7ad50 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 17:18:41 +0300 Subject: [PATCH 251/357] collapsing test 3 --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d51dc33538..ee75a598aa 100644 --- a/README.md +++ b/README.md @@ -542,7 +542,7 @@ After SSN node deployment following GCP resources will be created: Terminating SSN node will also remove all nodes and components related to it. Basically, terminating Self-service node will terminate all DLab’s infrastructure. Example of command for terminating DLab environment: -#### In Amazon +
In Amazon ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXX --aws_region xx-xxxxx-x --key_path /path/to/key/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider aws --action terminate ``` @@ -559,8 +559,8 @@ List of parameters for SSN node termination: | conf\_os\_family | Name of the Linux distributive family, which is supported by DLab (Debian/RedHat) | | conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (AWS) | | action | terminate | - -#### In Azure +
+
In Azure ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --azure_vpc_name vpc-test --azure_resource_group_name resource-group-test --azure_region westus2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider azure --azure_auth_path /dir/file.json --action terminate ``` @@ -578,8 +578,8 @@ List of parameters for SSN node termination: | azure\_auth\_path | Full path to auth json file | | action | terminate | - -#### In Google cloud +
+
In Google cloud ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --gcp_project_id project_id --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xx-xxxxx-x --key_path /path/to/key/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider gcp --gcp_service_account_path /path/to/auth/file.json --action terminate ``` @@ -597,7 +597,7 @@ List of parameters for SSN node termination: | gcp\_service\_account\_path | Full path to auth json file | | gcp\_project\_id | ID of GCP project | | action | In case of SSN node termination, this parameter should be set to “terminate” | - +
## Edge Node Gateway node (or an Edge node) is an instance(virtual machine) provisioned in a public subnet. It serves as an entry point for accessing user’s personal analytical environment. It is created by an end-user, whose public key will be uploaded there. Only via Edge node, DLab user can access such application resources as notebook servers and dataengine clusters. Also, Edge Node is used to setup SOCKS proxy to access notebook servers via Web UI and SSH. Elastic(Static) IP address is assigned to an Edge Node. In case Edge node instance has been removed by mistake, there is an option to re-create it and Edge node IP address won’t change. From aa4ecf0ea38843d7d4e2efebdf7b6f9adcbd5183 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 17:19:23 +0300 Subject: [PATCH 252/357] collapsing test 3 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ee75a598aa..922ecb5ed3 100644 --- a/README.md +++ b/README.md @@ -560,6 +560,7 @@ List of parameters for SSN node termination: | conf\_cloud\_provider | Name of the cloud provider, which is supported by DLab (AWS) | | action | terminate |
+
In Azure ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --azure_vpc_name vpc-test --azure_resource_group_name resource-group-test --azure_region westus2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider azure --azure_auth_path /dir/file.json --action terminate @@ -598,6 +599,7 @@ List of parameters for SSN node termination: | gcp\_project\_id | ID of GCP project | | action | In case of SSN node termination, this parameter should be set to “terminate” |
+ ## Edge Node Gateway node (or an Edge node) is an instance(virtual machine) provisioned in a public subnet. It serves as an entry point for accessing user’s personal analytical environment. It is created by an end-user, whose public key will be uploaded there. Only via Edge node, DLab user can access such application resources as notebook servers and dataengine clusters. Also, Edge Node is used to setup SOCKS proxy to access notebook servers via Web UI and SSH. Elastic(Static) IP address is assigned to an Edge Node. In case Edge node instance has been removed by mistake, there is an option to re-create it and Edge node IP address won’t change. From 2b6440c9c92dd3940ae01bd2f16b39b135d3834f Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 17:51:36 +0300 Subject: [PATCH 253/357] collapsing test 4 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 922ecb5ed3..1146088dcd 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ These directories contain the log files for each template and for DLab back-end Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. -
In Amazon cloud +
In Amazon cloud (*click to expand*) Prerequisites: From b6cfd09c126a4138840288df502c08dc0fd6e820 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 17:53:13 +0300 Subject: [PATCH 254/357] collapsing test 5 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1146088dcd..0ea33292bb 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ These directories contain the log files for each template and for DLab back-end Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. -
In Amazon cloud (*click to expand*) +
In Amazon cloud (_click to expand_) Prerequisites: From 17e58e18e5f6fd5506513c8291e97f781d8e9c34 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 17:54:10 +0300 Subject: [PATCH 255/357] collapsing test 6 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ea33292bb..a3449cdcbd 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ These directories contain the log files for each template and for DLab back-end Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. -
In Amazon cloud (_click to expand_) +
In Amazon cloud (click to expand) Prerequisites: From 45b1fb3371b57386da4813356612b7bd57d90599 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 18:01:57 +0300 Subject: [PATCH 256/357] collapsing test 7 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a3449cdcbd..fc48af263a 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ These directories contain the log files for each template and for DLab back-end Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. -
In Amazon cloud (click to expand) +
In Amazon cloud (click to expand) Prerequisites: @@ -325,7 +325,7 @@ Preparation steps for deployment: - Put SSH key file created through Amazon Console on the instance with the same name - Install Git and clone DLab repository
-
In Azure cloud +
In Azure cloud (click to expand) Prerequisites: @@ -338,7 +338,7 @@ Prerequisites: - Microsoft Graph - Windows Azure Service Management API
-
In Google cloud (GCP) +
In Google cloud (GCP) (click to expand) Prerequisites: From 298eb290f88958ec4a0c4a45102637b0e6de89c9 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 18:03:43 +0300 Subject: [PATCH 257/357] collapsing test 8 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc48af263a..ce500f1c48 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ Prerequisites: - Microsoft Graph - Windows Azure Service Management API
-
In Google cloud (GCP) (click to expand) +
In Google cloud (GCP) (click to expand) Prerequisites: From c3b661f26d0f31d18ee2e7818cce5a1fe1c468ce Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 2 Jul 2019 18:11:12 +0300 Subject: [PATCH 258/357] collapsing test 8 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ce500f1c48..1cf8a21e08 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ These directories contain the log files for each template and for DLab back-end Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. -
In Amazon cloud (click to expand) +
In Amazon cloud Prerequisites: @@ -325,7 +325,7 @@ Preparation steps for deployment: - Put SSH key file created through Amazon Console on the instance with the same name - Install Git and clone DLab repository
-
In Azure cloud (click to expand) +
In Azure cloud Prerequisites: @@ -338,7 +338,7 @@ Prerequisites: - Microsoft Graph - Windows Azure Service Management API
-
In Google cloud (GCP) (click to expand) +
In Google cloud (GCP) Prerequisites: From 85f064eb246555b25c46b9ea088b8012879398eb Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 3 Jul 2019 11:19:47 +0300 Subject: [PATCH 259/357] collapsing test final --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1cf8a21e08..cec502f790 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ These directories contain the log files for each template and for DLab back-end Deployment of DLab starts from creating Self-Service(SSN) node. DLab can be deployed in AWS, Azure and Google cloud. For each cloud provider, prerequisites are different. -
In Amazon cloud +
In Amazon cloud (click to expand) Prerequisites: @@ -325,7 +325,7 @@ Preparation steps for deployment: - Put SSH key file created through Amazon Console on the instance with the same name - Install Git and clone DLab repository
-
In Azure cloud +
In Azure cloud Prerequisites: @@ -338,7 +338,7 @@ Prerequisites: - Microsoft Graph - Windows Azure Service Management API
-
In Google cloud (GCP) +
In Google cloud (GCP) Prerequisites: @@ -543,6 +543,7 @@ Terminating SSN node will also remove all nodes and components related to it. Ba Example of command for terminating DLab environment:
In Amazon + ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXX --aws_region xx-xxxxx-x --key_path /path/to/key/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider aws --action terminate ``` @@ -578,9 +579,10 @@ List of parameters for SSN node termination: | conf\_key\_name | Name of the uploaded SSH key file (without “.pem” extension) | | azure\_auth\_path | Full path to auth json file | | action | terminate | -
+
In Google cloud + ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --gcp_project_id project_id --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xx-xxxxx-x --key_path /path/to/key/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider gcp --gcp_service_account_path /path/to/auth/file.json --action terminate ``` From c007b1a090c0fca126f1799882d76ee50c6efcc9 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 3 Jul 2019 11:40:44 +0300 Subject: [PATCH 260/357] [DLAB-831]: added project status to dashboard --- .../project/project-list/project-list.component.html | 7 +++++++ .../project/project-list/project-list.component.scss | 8 ++++++-- .../project/project-list/project-list.component.ts | 2 +- .../reporting-grid/reporting-grid.component.ts | 10 ---------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index dd1994227f..d43d801e50 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -32,6 +32,13 @@ + + Status + + {{ element.status.toLowerCase() }} + + + Groups diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss index b78dca45f6..bd3ebddbff 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -25,15 +25,19 @@ table { } .endpoints { - width: 30%; + width: 25%; padding: 0 10px; } .groups { - width: 35%; + width: 25%; padding: 0 10px; } + .status { + width: 15%; + } + .project-actions { color: #607d8b; width: 10%; diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index 1870b5954b..5cf2d81b6e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -32,7 +32,7 @@ import { Project } from '../project.component'; }) export class ProjectListComponent implements OnInit, OnDestroy { - displayedColumns: string[] = ['name', 'endpoints', 'groups', 'actions']; + displayedColumns: string[] = ['name', 'status', 'endpoints', 'groups', 'actions']; dataSource: Project[] | any = []; @Output() editItem: EventEmitter<{}> = new EventEmitter(); @Output() deleteItem: EventEmitter<{}> = new EventEmitter(); diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts index 9310c17058..c65e01f8ca 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts @@ -41,16 +41,6 @@ export class ReportingGridComponent implements OnInit { displayedColumns: string[] = ['name', 'user', 'type', 'status', 'shape', 'service', 'charge']; displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions']; - // public filteringColumns: Array = [ - // { title: 'User', name: 'user', className: 'th_user', filtering: true, role: 'admin'}, - // { title: 'Environment name', name: 'dlab_id', className: 'env_name', filtering: true }, - // { title: 'Resource Type', name: 'resource_type', className: 'th_type', filtering: true }, - // { title: 'Status', name: 'status', className: 'th_rstatus', filtering: true }, - // { title: DICTIONARY.instance_size, name: DICTIONARY.billing.instance_size, className: 'th_shape', filtering: true }, - // { title: DICTIONARY.service, name: DICTIONARY.billing.service_filter_key, className: 'service', filtering: true }, - // { title: 'Service Charges', name: 'charges', className: 'th_charges', filtering: false } - // ]; - ngOnInit() { } onUpdate($event): void { From 7ea4cc0404c10cff64a9a46736f84a982978d00d Mon Sep 17 00:00:00 2001 From: bhliva Date: Wed, 3 Jul 2019 11:10:45 +0300 Subject: [PATCH 261/357] DLAB-000 added project parameter for start/stop exploratory --- .../com/epam/dlab/backendapi/util/RequestBuilder.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java index 350fa0ea87..0cab73ad2c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java @@ -251,14 +251,16 @@ public T newExploratoryStart(UserInfo u .withGitCreds(exploratoryGitCredsDTO.getGitCreds()) .withNotebookImage(userInstance.getImageName()) .withExploratoryName(userInstance.getExploratoryName()) - .withReuploadKeyRequired(userInstance.isReuploadKeyRequired()); + .withReuploadKeyRequired(userInstance.isReuploadKeyRequired()) + .withProject(userInstance.getProject()); case AZURE: T exploratoryStart = (T) newResourceSysBaseDTO(userInfo, ExploratoryActionStartAzure.class) .withNotebookInstanceName(userInstance.getExploratoryId()) .withGitCreds(exploratoryGitCredsDTO.getGitCreds()) .withNotebookImage(userInstance.getImageName()) .withExploratoryName(userInstance.getExploratoryName()) - .withReuploadKeyRequired(userInstance.isReuploadKeyRequired()); + .withReuploadKeyRequired(userInstance.isReuploadKeyRequired()) + .withProject(userInstance.getProject()); if (settingsDAO.isAzureDataLakeEnabled()) { ((ExploratoryActionStartAzure) exploratoryStart) @@ -296,7 +298,8 @@ public > T newExploratoryStop(UserInfo userInf .withNotebookImage(userInstance.getImageName()) .withExploratoryName(userInstance.getExploratoryName()) .withNotebookImage(userInstance.getImageName()) - .withReuploadKeyRequired(userInstance.isReuploadKeyRequired()); + .withReuploadKeyRequired(userInstance.isReuploadKeyRequired()) + .withProject(userInstance.getProject()); } public ExploratoryGitCredsUpdateDTO newGitCredentialsUpdate(UserInfo userInfo, UserInstanceDTO instanceDTO, From 3ec5b41921f17dd894c0a31ca714b2e11cbb5f10 Mon Sep 17 00:00:00 2001 From: bhliva Date: Wed, 3 Jul 2019 11:23:37 +0300 Subject: [PATCH 262/357] DLAB-835 added project_name param for start/stop actions --- .../base/computational/ComputationalBase.java | 12 ++++++++ .../impl/ComputationalServiceImpl.java | 6 ++-- .../dlab/backendapi/util/RequestBuilder.java | 17 +++++++---- .../impl/ComputationalServiceImplTest.java | 29 ++++++++++--------- .../backendapi/util/RequestBuilderTest.java | 6 ++-- 5 files changed, 46 insertions(+), 24 deletions(-) diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/computational/ComputationalBase.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/computational/ComputationalBase.java index 0b233b5f1c..f33e0ec5cf 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/computational/ComputationalBase.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/computational/ComputationalBase.java @@ -36,6 +36,9 @@ public abstract class ComputationalBase> extends @JsonProperty("notebook_template_name") private String notebookTemplateName; + @JsonProperty("project_name") + private String project; + public String getComputationalName() { return computationalName; } @@ -75,6 +78,15 @@ public T withNotebookTemplateName(String notebookTemplateName) { return self; } + public T withProject(String project) { + this.project = project; + return self; + } + + public String getProject() { + return project; + } + @Override public ToStringHelper toStringHelper(Object self) { return super.toStringHelper(self) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java index 4a6ab80794..1fe97d541f 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImpl.java @@ -131,13 +131,15 @@ public void terminateComputational(UserInfo userInfo, String exploratoryName, St updateComputationalStatus(userInfo.getName(), exploratoryName, computationalName, TERMINATING); - String exploratoryId = exploratoryDAO.fetchExploratoryId(userInfo.getName(), exploratoryName); + final UserInstanceDTO userInstanceDTO = exploratoryDAO.fetchExploratoryFields(userInfo.getName(), + exploratoryName); UserComputationalResource compResource = computationalDAO.fetchComputationalFields(userInfo .getName(), exploratoryName, computationalName); final DataEngineType dataEngineType = compResource.getDataEngineType(); ComputationalTerminateDTO dto = requestBuilder.newComputationalTerminate(userInfo, exploratoryName, - exploratoryId, computationalName, compResource.getComputationalId(), dataEngineType); + userInstanceDTO.getExploratoryId(), computationalName, compResource.getComputationalId(), + dataEngineType, userInstanceDTO.getProject()); final String provisioningUrl = Optional.ofNullable(DATA_ENGINE_TYPE_TERMINATE_URLS.get(dataEngineType)) .orElseThrow(UnsupportedOperationException::new); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java index 0cab73ad2c..1d1aa12193 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java @@ -403,7 +403,8 @@ public > T newComputationalCreate(UserInfo userIn .withComputationalName(form.getName()) .withNotebookTemplateName(userInstance.getTemplateName()) .withApplicationName(getApplicationNameFromImage(userInstance.getImageName())) - .withNotebookInstanceName(userInstance.getExploratoryId()); + .withNotebookInstanceName(userInstance.getExploratoryId()) + .withProject(userInstance.getProject()); } @SuppressWarnings("unchecked") @@ -452,7 +453,8 @@ public > T newComputationalCreate(UserInfo userIn .withComputationalName(form.getName()) .withNotebookTemplateName(userInstance.getTemplateName()) .withApplicationName(getApplicationNameFromImage(userInstance.getImageName())) - .withNotebookInstanceName(userInstance.getExploratoryId()); + .withNotebookInstanceName(userInstance.getExploratoryId()) + .withProject(userInstance.getProject()); } @SuppressWarnings("unchecked") @@ -461,7 +463,7 @@ public > T newComputationalTerminate(UserInfo use String exploratoryId, String computationalName, String computationalId, - DataEngineType dataEngineType) { + DataEngineType dataEngineType, String project) { T computationalTerminate; switch (cloudProvider()) { @@ -492,7 +494,8 @@ public > T newComputationalTerminate(UserInfo use return computationalTerminate .withExploratoryName(exploratoryName) .withComputationalName(computationalName) - .withNotebookInstanceName(exploratoryId); + .withNotebookInstanceName(exploratoryId) + .withProject(project); } @SuppressWarnings("unchecked") @@ -503,7 +506,8 @@ public > T newComputationalStop(UserInfo userInfo .withExploratoryName(exploratory.getExploratoryName()) .withComputationalName(computationalName) .withNotebookInstanceName(exploratory.getExploratoryId()) - .withApplicationName(getApplicationNameFromImage(exploratory.getImageName())); + .withApplicationName(getApplicationNameFromImage(exploratory.getImageName())) + .withProject(exploratory.getProject()); } @SuppressWarnings("unchecked") @@ -513,7 +517,8 @@ public > T newComputationalStart(UserInfo userInf .withExploratoryName(exploratory.getExploratoryName()) .withComputationalName(computationalName) .withNotebookInstanceName(exploratory.getExploratoryId()) - .withApplicationName(getApplicationNameFromImage(exploratory.getImageName())); + .withApplicationName(getApplicationNameFromImage(exploratory.getImageName())) + .withProject(exploratory.getProject()); } @SuppressWarnings("unchecked") diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java index 6da6ee8883..78e845961f 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ComputationalServiceImplTest.java @@ -184,7 +184,8 @@ public void createSparkClusterWhenMethodFetchExploratoryFieldsThrowsException() } verify(computationalDAO, never()).addComputational(USER, EXPLORATORY_NAME, sparkClusterResource); - verify(computationalDAO, never()).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, "self")); + verify(computationalDAO, never()).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, + "self")); verify(exploratoryDAO).fetchExploratoryFields(USER, EXPLORATORY_NAME); verifyNoMoreInteractions(configuration, computationalDAO, exploratoryDAO); } @@ -220,7 +221,7 @@ public void terminateComputationalEnvironment() { when(computationalDAO.updateComputationalStatus(any(ComputationalStatusDTO.class))) .thenReturn(mock(UpdateResult.class)); String explId = "explId"; - when(exploratoryDAO.fetchExploratoryId(anyString(), anyString())).thenReturn(explId); + when(exploratoryDAO.fetchExploratoryFields(anyString(), anyString())).thenReturn(userInstance); String compId = "compId"; UserComputationalResource ucResource = new UserComputationalResource(); @@ -233,7 +234,7 @@ public void terminateComputationalEnvironment() { ctDto.setComputationalName(COMP_NAME); ctDto.setExploratoryName(EXPLORATORY_NAME); when(requestBuilder.newComputationalTerminate(any(UserInfo.class), anyString(), anyString(), anyString(), - anyString(), any(DataEngineType.class))).thenReturn(ctDto); + anyString(), any(DataEngineType.class), anyString())).thenReturn(ctDto); when(provisioningService.post(anyString(), anyString(), any(ComputationalTerminateDTO.class), any())) .thenReturn(UUID); @@ -244,15 +245,14 @@ public void terminateComputationalEnvironment() { verify(computationalDAO).updateComputationalStatus(refEq(computationalStatusDTOWithStatusTerminating, "self")); verify(computationalDAO).fetchComputationalFields(USER, EXPLORATORY_NAME, COMP_NAME); - verify(exploratoryDAO).fetchExploratoryId(USER, EXPLORATORY_NAME); - verify(requestBuilder).newComputationalTerminate(userInfo, EXPLORATORY_NAME, explId, COMP_NAME, compId, - DataEngineType.CLOUD_SERVICE); + DataEngineType.CLOUD_SERVICE, null); verify(provisioningService).post(ComputationalAPI.COMPUTATIONAL_TERMINATE_CLOUD_SPECIFIC, TOKEN, ctDto, String.class); verify(requestId).put(USER, UUID); + verify(exploratoryDAO).fetchExploratoryFields(USER, EXPLORATORY_NAME); verifyNoMoreInteractions(computationalDAO, exploratoryDAO, requestBuilder, provisioningService, requestId); } @@ -297,7 +297,7 @@ public void terminateComputationalEnvironmentWhenMethodFetchComputationalFieldsT verify(computationalDAO).updateComputationalStatus(refEq(computationalStatusDTOWithStatusTerminating, "self")); verify(computationalDAO).fetchComputationalFields(USER, EXPLORATORY_NAME, COMP_NAME); verify(computationalDAO).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, "self")); - verify(exploratoryDAO).fetchExploratoryId(USER, EXPLORATORY_NAME); + verify(exploratoryDAO).fetchExploratoryFields(USER, EXPLORATORY_NAME); verifyNoMoreInteractions(computationalDAO, exploratoryDAO); } @@ -306,7 +306,7 @@ public void terminateComputationalEnvironmentWhenMethodNewComputationalTerminate when(computationalDAO.updateComputationalStatus(any(ComputationalStatusDTO.class))) .thenReturn(mock(UpdateResult.class)); String explId = "explId"; - when(exploratoryDAO.fetchExploratoryId(anyString(), anyString())).thenReturn(explId); + when(exploratoryDAO.fetchExploratoryFields(anyString(), anyString())).thenReturn(userInstance); String compId = "compId"; UserComputationalResource ucResource = new UserComputationalResource(); @@ -317,7 +317,7 @@ public void terminateComputationalEnvironmentWhenMethodNewComputationalTerminate doThrow(new DlabException("Cannot create instance of resource class ")) .when(requestBuilder).newComputationalTerminate(any(UserInfo.class), anyString(), anyString(), - anyString(), anyString(), any(DataEngineType.class)); + anyString(), anyString(), any(DataEngineType.class), anyString()); when(computationalDAO.updateComputationalStatus(any(ComputationalStatusDTO.class))) .thenReturn(mock(UpdateResult.class)); @@ -331,10 +331,10 @@ public void terminateComputationalEnvironmentWhenMethodNewComputationalTerminate verify(computationalDAO).updateComputationalStatus(refEq(computationalStatusDTOWithStatusTerminating, "self")); verify(computationalDAO).fetchComputationalFields(USER, EXPLORATORY_NAME, COMP_NAME); - verify(exploratoryDAO).fetchExploratoryId(USER, EXPLORATORY_NAME); + verify(exploratoryDAO).fetchExploratoryFields(USER, EXPLORATORY_NAME); verify(requestBuilder).newComputationalTerminate(userInfo, EXPLORATORY_NAME, explId, COMP_NAME, compId, - DataEngineType.CLOUD_SERVICE); + DataEngineType.CLOUD_SERVICE, null); verify(computationalDAO).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, "self")); verifyNoMoreInteractions(computationalDAO, exploratoryDAO, requestBuilder); } @@ -405,7 +405,8 @@ public void createDataEngineServiceWhenMethodFetchExploratoryFieldsThrowsExcepti verify(exploratoryDAO).fetchExploratoryFields(USER, EXPLORATORY_NAME); - verify(computationalDAO, never()).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, "self")); + verify(computationalDAO, never()).updateComputationalStatus(refEq(computationalStatusDTOWithStatusFailed, + "self")); verifyNoMoreInteractions(computationalDAO, exploratoryDAO); } @@ -665,7 +666,9 @@ private UserInfo getUserInfo() { } private UserInstanceDTO getUserInstanceDto() { - return new UserInstanceDTO().withUser(USER).withExploratoryName(EXPLORATORY_NAME).withTags(Collections.emptyMap()); + return new UserInstanceDTO().withUser(USER).withExploratoryName(EXPLORATORY_NAME) + .withExploratoryId("explId") + .withTags(Collections.emptyMap()); } private List getFormList() { diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/util/RequestBuilderTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/util/RequestBuilderTest.java index ff3e76510a..82fd834fed 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/util/RequestBuilderTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/util/RequestBuilderTest.java @@ -972,7 +972,7 @@ public void newComputationalTerminateForAws() { when(settingsDAO.getConfTagResourceId()).thenReturn("someConfTagResourceId"); requestBuilder.newComputationalTerminate(userInfo, "explName", "explId", "compName", - "compId", DataEngineType.CLOUD_SERVICE); + "compId", DataEngineType.CLOUD_SERVICE, ""); verify(configuration, times(3)).getCloudProvider(); verify(settingsDAO).getServiceBaseName(); @@ -999,7 +999,7 @@ public void newComputationalTerminateForAzure() { when(settingsDAO.getAzureVpcName()).thenReturn("someAzureVpcId"); requestBuilder.newComputationalTerminate(userInfo, "explName", "explId", "compName", - "compId", DataEngineType.CLOUD_SERVICE); + "compId", DataEngineType.CLOUD_SERVICE, ""); verify(configuration, times(3)).getCloudProvider(); verify(settingsDAO).getServiceBaseName(); @@ -1020,7 +1020,7 @@ public void newComputationalTerminateForGcp() { when(settingsDAO.getConfOsFamily()).thenReturn("someConfOsFamily"); requestBuilder.newComputationalTerminate(userInfo, "explName", "explId", "compName", - "compId", DataEngineType.CLOUD_SERVICE); + "compId", DataEngineType.CLOUD_SERVICE, ""); verify(configuration, times(3)).getCloudProvider(); verify(configuration).getMaxUserNameLength(); From 0224312dad8a87744e20eedc63fa70475be7519b Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 3 Jul 2019 14:12:34 +0300 Subject: [PATCH 263/357] [DLAB-831]: prevent project edition for not active projects --- .../project/project-list/project-list.component.html | 7 +++++-- .../resources/resources-grid/resources-grid.component.css | 5 ++++- .../self-service/src/main/resources/webapp/src/styles.scss | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index d43d801e50..0423209c4a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -51,8 +51,11 @@ - - mode_edit + + + mode_edit + delete_forever diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css index 406e726d6b..f013f2dcfa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css @@ -149,6 +149,7 @@ .settings { position: relative; } + .settings .disabled { opacity: 0.4; cursor: not-allowed; @@ -168,12 +169,13 @@ .data-grid .list-menu li { font-size: 14px; border-bottom: 1px solid #edf1f5; - padding: 12px 15px; + padding: 8px 15px; cursor: pointer; margin: 5px -5px; color: #577289; transition: all 0.45s ease-in-out; } + .data-grid .list-menu a.navigate { text-decoration: none; color: #577289; @@ -207,6 +209,7 @@ .data-grid .message_block { background: #edf6f9; } + .message_block td { text-align: left !important; } diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index ed72357ed2..5b72b0fb9e 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -104,7 +104,8 @@ mat-chip.mat-chip strong { .running, .starting, -.installed { +.installed, +.active { color: #49af38; } @@ -141,7 +142,7 @@ mat-chip.mat-chip strong { } .not-active { - cursor: not-allowed; + cursor: not-allowed !important; opacity: .6; } From cd03b743b824854989f1d8a69bb969187783b0cd Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 3 Jul 2019 14:47:51 +0300 Subject: [PATCH 264/357] AWS/Azure/GCP sections expanding added --- README.md | 154 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 97 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index cec502f790..6df83147b5 100644 --- a/README.md +++ b/README.md @@ -325,7 +325,7 @@ Preparation steps for deployment: - Put SSH key file created through Amazon Console on the instance with the same name - Install Git and clone DLab repository
-
In Azure cloud +
In Azure cloud (click to expand) Prerequisites: @@ -338,7 +338,7 @@ Prerequisites: - Microsoft Graph - Windows Azure Service Management API
-
In Google cloud (GCP) +
In Google cloud (GCP) (click to expand) Prerequisites: @@ -377,7 +377,7 @@ pip install fabric==1.14.0 This python script will build front-end and back-end part of DLab, create SSN docker image and run Docker container for creating SSN node. -
In Amazon cloud +
In Amazon cloud (click to expand) ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXXXX --aws_region xx-xxxxx-x --conf_os_family debian --conf_cloud_provider aws --aws_vpc_id vpc-xxxxx --aws_subnet_id subnet-xxxxx --aws_security_groups_ids sg-xxxxx,sg-xxxx --key_path /path/to/key/ --conf_key_name key_name --conf_tag_resource_id dlab --aws_account_id xxxxxxxx --aws_billing_bucket billing_bucket --aws_report_path /billing/directory/ --action create @@ -426,7 +426,7 @@ After SSN node deployment following AWS resources will be created: - S3 bucket – its name will be \-ssn-bucket. This bucket will contain necessary dependencies and configuration files for Notebook nodes (such as .jar files, YARN configuration, etc.) - S3 bucket for for collaboration between Dlab users. Its name will be \-shared-bucket
-
In Azure cloud +
In Azure cloud (click to expand) ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab_test --azure_region westus2 --conf_os_family debian --conf_cloud_provider azure --azure_vpc_name vpc-test --azure_subnet_name subnet-test --azure_security_group_name sg-test1,sg-test2 --key_path /root/ --conf_key_name Test --azure_auth_path /dir/file.json --action create @@ -499,7 +499,7 @@ After SSN node deployment following Azure resources will be created: - Storage account and blob container for collaboration between Dlab users - If support of Data Lake is enabled: Data Lake and shared directory will be created
-
In Google cloud (GCP) +
In Google cloud (GCP) (click to expand) ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xxx-xxxxx-x --conf_os_family debian --conf_cloud_provider gcp --key_path /path/to/key/ --conf_key_name key_name --gcp_ssn_instance_size n1-standard-1 --gcp_project_id project_id --gcp_service_account_path /path/to/auth/file.json --action create @@ -542,7 +542,7 @@ After SSN node deployment following GCP resources will be created: Terminating SSN node will also remove all nodes and components related to it. Basically, terminating Self-service node will terminate all DLab’s infrastructure. Example of command for terminating DLab environment: -
In Amazon +
In Amazon (click to expand) ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --aws_access_key XXXXXXX --aws_secret_access_key XXXXXXXX --aws_region xx-xxxxx-x --key_path /path/to/key/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider aws --action terminate @@ -562,7 +562,7 @@ List of parameters for SSN node termination: | action | terminate |
-
In Azure +
In Azure (click to expand) ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --azure_vpc_name vpc-test --azure_resource_group_name resource-group-test --azure_region westus2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider azure --azure_auth_path /dir/file.json --action terminate ``` @@ -581,7 +581,7 @@ List of parameters for SSN node termination: | action | terminate |
-
In Google cloud +
In Google cloud (click to expand) ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --gcp_project_id project_id --conf_service_base_name dlab-test --gcp_region xx-xxxxx --gcp_zone xx-xxxxx-x --key_path /path/to/key/ --conf_key_name key_name --conf_os_family debian --conf_cloud_provider gcp --gcp_service_account_path /path/to/auth/file.json --action terminate @@ -610,7 +610,7 @@ Gateway node (or an Edge node) is an instance(virtual machine) provisioned in a In order to create Edge node using DLab Web UI – login and, click on the button “Upload” (Depending on authorization provider that was chosen on deployment stage, user may be taken from [LDAP](#LDAP_Authentication) or from [Azure AD (Oauth2)](#Azure_OAuth2_Authentication)). Choose user’s SSH public key and after that click on the button “Create”. Edge node will be deployed and corresponding instance (virtual machine) will be started. -#### In Amazon +
In Amazon (click to expand) The following AWS resources will be created: - Edge EC2 instance @@ -640,8 +640,9 @@ List of parameters for Edge node creation: | aws\_private\_subnet\_prefix | Prefix of the private subnet | | conf\_tag\_resource\_id | The name of tag for billing reports | | action | create | +
-#### In Azure +
In Azure (click to expand) The following Azure resources will be created: - Edge virtual machine @@ -668,8 +669,9 @@ List of parameters for Edge node creation: | azure\_vpc\_name | Name of Azure Virtual network where all infrastructure is being deployed | | azure\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | | action | create | +
-#### In Google cloud +
In Google cloud (click to expand) The following GCP resources will be created: - Edge VM instance @@ -696,12 +698,13 @@ List of parameters for Edge node creation: | gcp\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | | gcp\_project\_id | ID of GCP project | | action | create | +
### Start/Stop To start/stop Edge node, click on the button which looks like a cycle on the top right corner, then click on the button which is located in “Action” field and in the drop-down menu click on the appropriate action. -#### In Amazon +
In Amazon (click to expand) List of parameters for Edge node starting/stopping: @@ -712,8 +715,9 @@ List of parameters for Edge node starting/stopping: | edge\_user\_name | Name of the user | | aws\_region | AWS region where infrastructure was deployed | | action | start/stop | +
-#### In Azure +
In Azure (click to expand) List of parameters for Edge node starting: @@ -735,8 +739,9 @@ List of parameters for Edge node stopping: | edge\_user\_name | Name of the user | | azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | | action | stop | +
-#### In Google cloud +
In Google cloud (click to expand) List of parameters for Edge node starting/stopping: @@ -749,6 +754,7 @@ List of parameters for Edge node starting/stopping: | gcp\_zone | GCP zone where infrastructure was deployed | | gcp\_project\_id | ID of GCP project | | action | start/stop | +
### Recreate @@ -758,7 +764,7 @@ If Edge node was removed for some reason, to re-create it, click on the status b List of parameters for Edge node recreation: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |----------------------------|-----------------------------------------------------------------------------------| @@ -774,8 +780,9 @@ List of parameters for Edge node recreation: | edge\_elastic\_ip | AWS Elastic IP address which was associated to Edge node | | conf\_tag\_resource\_id | The name of tag for billing reports | | action | Create | +
-#### In Azure +
In Azure (click to expand) | Parameter | Description/Value | |------------------------------|-----------------------------------------------------------------------------------| @@ -789,8 +796,10 @@ List of parameters for Edge node recreation: | azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | | azure\_subnet\_name | Name of the Azure public subnet where Edge was deployed | | action | Create | +
+ +
In Google cloud (click to expand) -#### In Google cloud | Parameter | Description/Value | |--------------------------------|-----------------------------------------------------------------------------------| | conf\_resource | edge | @@ -804,6 +813,7 @@ List of parameters for Edge node recreation: | gcp\_subnet\_name | Name of the Azure public subnet where Edge will be deployed | | gcp\_project\_id | ID of GCP project | | action | create | +
## Notebook node @@ -815,7 +825,7 @@ To create Notebook node, click on the “Create new” button. Then, in drop-dow List of parameters for Notebook node creation: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |-------------------------------|-----------------------------------------------------------------------------------| @@ -833,8 +843,9 @@ List of parameters for Notebook node creation: | action | Create | **Note:** For format of git_creds see "Manage git credentials" lower. +
-#### In Azure +
In Azure (click to expand) | Parameter | Description/Value | |---------------------------------|-----------------------------------------------------------------------------------| @@ -850,8 +861,9 @@ List of parameters for Notebook node creation: | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | | git\_creds | User git credentials in JSON format | | action | Create | +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |-------------------------------|-----------------------------------------------------------------------------------| @@ -868,6 +880,7 @@ List of parameters for Notebook node creation: | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | | git\_creds | User git credentials in JSON format | | action | Create | +
### Stop @@ -875,7 +888,7 @@ In order to stop Notebook node, click on the “gear” button in Actions column List of parameters for Notebook node stopping: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |---------------------------|--------------------------------------------------------------| @@ -886,8 +899,9 @@ List of parameters for Notebook node stopping: | notebook\_instance\_name | Name of the Notebook instance to terminate | | aws\_region | AWS region where infrastructure was deployed | | action | Stop | +
-#### In Azure +
In Azure (click to expand) | Parameter | Description/Value | |---------------------------------|-----------------------------------------------------------------------------------| @@ -898,8 +912,9 @@ List of parameters for Notebook node stopping: | notebook\_instance\_name | Name of the Notebook instance to terminate | | azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | | action | Stop | +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |---------------------------|--------------------------------------------------------------| @@ -912,6 +927,7 @@ List of parameters for Notebook node stopping: | gcp\_zone | GCP zone where infrastructure was deployed | | gcp\_project\_id | ID of GCP project | | action | Stop | +
### Start @@ -919,7 +935,7 @@ In order to start Notebook node, click on the button, which looks like gear in List of parameters for Notebook node start: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |---------------------------|--------------------------------------------------------------| @@ -933,8 +949,9 @@ List of parameters for Notebook node start: | action | start | **Note:** For format of git_creds see "Manage git credentials" lower. +
-#### In Azure +
In Azure (click to expand) | Parameter | Description/Value | |---------------------------------|-----------------------------------------------------------------------------------| @@ -947,8 +964,9 @@ List of parameters for Notebook node start: | azure\_region | Azure region where infrastructure was deployed | | git\_creds | User git credentials in JSON format | | action | start | +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |---------------------------|--------------------------------------------------------------| @@ -962,6 +980,7 @@ List of parameters for Notebook node start: | gcp\_project\_id | ID of GCP project | | git\_creds | User git credentials in JSON format | | action | Stop | +
### Terminate @@ -969,7 +988,7 @@ In order to terminate Notebook node, click on the button, which looks like gear List of parameters for Notebook node termination: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |---------------------------|--------------------------------------------------------------| @@ -982,8 +1001,9 @@ List of parameters for Notebook node termination: | action | terminate | **Note:** If terminate action is called, all connected data engine clusters will be removed. +
-#### In Azure +
In Azure (click to expand) | Parameter | Description/Value | |---------------------------------|-----------------------------------------------------------------------------------| @@ -993,8 +1013,9 @@ List of parameters for Notebook node termination: | notebook\_instance\_name | Name of the Notebook instance to terminate | | azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | | action | terminate | +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |---------------------------|--------------------------------------------------------------| @@ -1007,12 +1028,13 @@ List of parameters for Notebook node termination: | gcp\_project\_id | ID of GCP project | | git\_creds | User git credentials in JSON format | | action | Stop | +
### List/Install additional libraries In order to list available libraries (OS/Python2/Python3/R/Others) on Notebook node, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. -#### In Amazon +
In Amazon (click to expand) List of parameters for Notebook node to **get list** of available libraries: @@ -1072,8 +1094,9 @@ List of parameters for Notebook node to **install** additional libraries: ... } ``` +
-#### In Azure +
In Azure (click to expand) List of parameters for Notebook node to **get list** of available libraries: @@ -1101,9 +1124,9 @@ List of parameters for Notebook node to **install** additional libraries: | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | | libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| | action | lib_install | +
- -#### In Google cloud +
In Google cloud (click to expand) List of parameters for Notebook node to **get list** of available libraries: @@ -1133,12 +1156,13 @@ List of parameters for Notebook node to **install** additional libraries: | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | | libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| | action | lib_install | +
### Manage git credentials In order to manage git credentials on Notebook node, click on the button “Git credentials”. Then in menu you can add or edit existing credentials. -#### In Amazon +
In Amazon (click to expand) List of parameters for Notebook node to **manage git credentials**: @@ -1170,8 +1194,9 @@ List of parameters for Notebook node to **manage git credentials**: **Note:** Leave "hostname" field empty to apply login/password by default for all services. **Note:** Also your can use "Personal access tokens" against passwords. +
-#### In Azure +
In Azure (click to expand) | Parameter | Description/Value | |-------------------------------|-----------------------------------------------------------------------------------| @@ -1183,8 +1208,9 @@ List of parameters for Notebook node to **manage git credentials**: | azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | | git\_creds | User git credentials in JSON format | | action | git\_creds | +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |-------------------------------|-----------------------------------------------------------------------------------| @@ -1198,6 +1224,7 @@ List of parameters for Notebook node to **manage git credentials**: | notebook\_instance\_name | Name of the Notebook instance to terminate | | git\_creds | User git credentials in JSON format | | action | git\_creds | +
## Dataengine-service cluster @@ -1209,7 +1236,7 @@ To create dataengine-service cluster click on the “gear” button in Actions c List of parameters for dataengine-service cluster creation: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |-----------------------------|--------------------------------------------------------------------------| @@ -1228,8 +1255,9 @@ List of parameters for dataengine-service cluster creation: | action | create | **Note:** If “Spot instances” is enabled, dataengine-service Slave nodes will be created as EC2 Spot instances. +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |---------------------------------|--------------------------------------------------------------------------| @@ -1250,6 +1278,7 @@ List of parameters for dataengine-service cluster creation: | gcp\_zone | GCP zone name | | conf\_tag\_resource\_id | The name of tag for billing reports | | action | create | +
### Terminate @@ -1257,7 +1286,7 @@ In order to terminate dataengine-service cluster, click on “x” button which List of parameters for dataengine-service cluster termination: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |---------------------------|---------------------------------------------------------------------| @@ -1269,8 +1298,9 @@ List of parameters for dataengine-service cluster termination: | notebook\_instance\_name | Name of the Notebook instance which dataengine-service is linked to | | aws\_region | AWS region where infrastructure was deployed | | action | Terminate | +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |---------------------------|---------------------------------------------------------------------| @@ -1284,12 +1314,13 @@ List of parameters for dataengine-service cluster termination: | gcp\_zone | GCP zone name | | dataproc\_cluster\_name | Dataproc cluster name | | action | Terminate | +
### List/Install additional libraries In order to list available libraries (OS/Python2/Python3/R/Others) on Dataengine-service, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. -#### In Amazon +
In Amazon (click to expand) List of parameters for Dataengine-service node to **get list** of available libraries: @@ -1347,8 +1378,9 @@ List of parameters for Dataengine-service to **install** additional libraries: ... } ``` +
-#### In Google cloud +
In Google cloud (click to expand) List of parameters for Dataengine-service node to **get list** of available libraries: @@ -1375,7 +1407,7 @@ List of parameters for Dataengine-service node to **install** additional librari | gcp\_region | GCP region name | | gcp\_zone | GCP zone name | | action | lib_install | - +
## Dataengine cluster @@ -1387,7 +1419,7 @@ To create Spark standalone cluster click on the “gear” button in Actions col List of parameters for dataengine cluster creation: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |--------------------------------|-----------------------------------------------------------------------------------| @@ -1402,8 +1434,9 @@ List of parameters for dataengine cluster creation: | aws\_dataengine\_master\_size | Size of master node | | aws\_dataengine\_slave\_size | Size of slave node | | action | create | +
-#### In Azure +
In Azure (click to expand) | Parameter | Description/Value | |--------------------------------|-----------------------------------------------------------------------------------| @@ -1421,8 +1454,9 @@ List of parameters for dataengine cluster creation: | azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned | | azure\_subnet\_name | Name of the Azure public subnet where Edge was deployed | | action | create | +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |------------------------------|-----------------------------------------------------------------------------------| @@ -1441,7 +1475,7 @@ List of parameters for dataengine cluster creation: | gcp\_zone | GCP zone name | | edge\_user\_name | Value that previously was used when Edge being provisioned | | action | create | - +
### Terminate @@ -1449,7 +1483,7 @@ In order to terminate dataengine cluster, click on “x” button which is locat List of parameters for dataengine cluster termination: -#### In Amazon +
In Amazon (click to expand) | Parameter | Description/Value | |------------------------------|--------------------------------------------------------------------------| @@ -1461,8 +1495,9 @@ List of parameters for dataengine cluster termination: | computational\_name | Name of cluster | | aws\_region | AWS region where infrastructure was deployed | | action | Terminate | +
-#### In Azure +
In Azure (click to expand) | Parameter | Description/Value | |------------------------------|--------------------------------------------------------------------------| @@ -1475,8 +1510,9 @@ List of parameters for dataengine cluster termination: | azure\_region | Azure region where infrastructure was deployed | | azure\_resource\_group\_name | Name of the resource group where all DLAb resources are being provisioned| | action | Terminate | +
-#### In Google cloud +
In Google cloud (click to expand) | Parameter | Description/Value | |------------------------------|--------------------------------------------------------------------------| @@ -1490,12 +1526,13 @@ List of parameters for dataengine cluster termination: | gcp\_region | GCP region where infrastructure was deployed | | gcp\_zone | GCP zone name | | action | Terminate | +
### List/Install additional libraries In order to list available libraries (OS/Python2/Python3/R/Others) on Dataengine, click on the button, which looks like gear in “Action” field. Then in drop-down menu choose “Manage libraries” action. -#### In Amazon +
In Amazon (click to expand) List of parameters for Dataengine node to **get list** of available libraries: @@ -1552,8 +1589,9 @@ List of parameters for Dataengine node to **install** additional libraries: ... } ``` +
-#### In Azure +
In Azure (click to expand) List of parameters for Dataengine node to **get list** of available libraries: @@ -1580,9 +1618,9 @@ List of parameters for Dataengine node to **install** additional libraries: | computational\_id | Name of cluster | | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | | action | lib_install | +
- -#### In Google cloud +
In Google cloud (click to expand) List of parameters for Dataengine node to **get list** of available libraries: @@ -1611,7 +1649,7 @@ List of parameters for Dataengine node to **install** additional libraries: | gcp\_zone | GCP zone name | | computational\_id | Name of cluster | | action | lib_install | - +
## Configuration files @@ -1656,7 +1694,7 @@ To use your own certificate please do the following: ## Billing report -### AWS +
AWS (click to expand) Billing module is implemented as a separate jar file and can be running in the follow modes: @@ -1686,8 +1724,9 @@ If you want billing to work as a separate process from the Self-Service use foll ``` java -cp /opt/dlab/webapp/lib/billing/billing-aws.x.y.jar com.epam.dlab.BillingScheduler --conf /opt/dlab/conf/billing.yml ``` +
-### Azure +
Azure (click to expand) Billing module is implemented as a separate jar file and can be running in the follow modes: @@ -1698,6 +1737,7 @@ If you want to start billing module as a separate process use the following comm ``` java -jar /opt/dlab/webapp/lib/billing/billing-azure.x.y.jar /opt/dlab/conf/billing.yml ``` +
## Backup and Restore From 898fa931f89e417fec095d8d662f262698c692f6 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 3 Jul 2019 15:45:40 +0300 Subject: [PATCH 265/357] contents updated --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6df83147b5..eb148d194d 100644 --- a/README.md +++ b/README.md @@ -15,14 +15,12 @@ CONTENTS [DLab Deployment](#DLab_Deployment) -        [Prerequisites](#Prerequisites) - -        [Preparing environment for DLab deployment](#Env_for_DLab) -         [Structure of main DLab directory](#DLab_directory)         [Structure of log directory](#log_directory) +        [Preparing environment for DLab deployment](#Env_for_DLab) +         [Self-Service Node](#Self_Service_Node)         [Edge Node](#Edge_Node) From d8e6785e2d8e162cbcc2f4c7936e7d625914ab4e Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 3 Jul 2019 16:00:24 +0300 Subject: [PATCH 266/357] contents fixed --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eb148d194d..55824502ec 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,9 @@ CONTENTS         [Notebook node](#Notebook_node) -        [EMR cluster](#EMR_cluster) +        [Dataengine-service cluster](#Dataengine-service cluster) + +        [Dataengine cluster](#Dataengine cluster)         [Configuration files](#Configuration_files) From 3bfc5c1d05a5c7d616c4e10b0e8bf98d264c90f9 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 3 Jul 2019 16:02:57 +0300 Subject: [PATCH 267/357] contents fixed --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 55824502ec..0895303322 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,9 @@ CONTENTS         [Notebook node](#Notebook_node) -        [Dataengine-service cluster](#Dataengine-service cluster) +        [Dataengine-service cluster](#Dataengine-service_cluster) -        [Dataengine cluster](#Dataengine cluster) +        [Dataengine cluster](#Dataengine_cluster)         [Configuration files](#Configuration_files) @@ -1226,7 +1226,7 @@ List of parameters for Notebook node to **manage git credentials**: | action | git\_creds |
-## Dataengine-service cluster +## Dataengine-service cluster Dataengine-service is a cluster provided by cloud as a service (EMR on AWS) can be created if more computational resources are needed for executing analytical algorithms and models, triggered from analytical tools. Jobs execution will be scaled to a cluster mode increasing the performance and decreasing execution time. @@ -1409,7 +1409,7 @@ List of parameters for Dataengine-service node to **install** additional librari | action | lib_install |
-## Dataengine cluster +## Dataengine cluster Dataengine is cluster based on Standalone Spark framework can be created if more computational resources are needed for executing analytical algorithms, but without additional expenses for cloud provided service. From 93c2639ea428413ae6acd318d1eebe78c3356717 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 3 Jul 2019 17:43:06 +0300 Subject: [PATCH 268/357] [DLAB-834]: added stop / start actions to project --- .../project-list/project-list.component.html | 16 +++++++++++++--- .../project-list/project-list.component.ts | 9 ++++++++- .../project/project.component.html | 4 +++- .../administration/project/project.component.ts | 17 +++++++++++++++++ 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 0423209c4a..01d858fbdc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -51,9 +51,19 @@ - - + + + + pause_circle_outline + + + play_circle_outline + + + + + mode_edit diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index 5cf2d81b6e..1dd821032c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -23,6 +23,7 @@ import { MatTableDataSource } from '@angular/material'; import { Subscription } from 'rxjs'; import { ProjectDataService } from '../project-data.service'; +import { ProjectService } from '../../../core/services'; import { Project } from '../project.component'; @Component({ @@ -36,12 +37,14 @@ export class ProjectListComponent implements OnInit, OnDestroy { dataSource: Project[] | any = []; @Output() editItem: EventEmitter<{}> = new EventEmitter(); @Output() deleteItem: EventEmitter<{}> = new EventEmitter(); + @Output() toggleStatus: EventEmitter<{}> = new EventEmitter(); private subscriptions: Subscription = new Subscription(); constructor( public toastr: ToastrService, - private projectDataService: ProjectDataService + private projectDataService: ProjectDataService, + private projectService: ProjectService ) { } @@ -55,6 +58,10 @@ export class ProjectListComponent implements OnInit, OnDestroy { this.subscriptions.unsubscribe(); } + public toggleProjectStatus(project, action) { + this.toggleStatus.emit({ project, action }); + } + public editProject(item: Project[]) { this.editItem.emit(item); } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index a40f264a8f..2e01d31202 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -39,6 +39,8 @@
- + +
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index dc888cff58..261b4d9e85 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -91,6 +91,23 @@ export class ProjectComponent implements OnInit, OnDestroy { }); } + public toggleStatus($event) { + const data = { 'project_name': $event.project.name }; + + if ($event.action === 'stop') { + this.dialog.open(NotificationDialogComponent, { data: { type: 'confirmation', item: $event.project, action: 'stopped' }, panelClass: 'modal-sm' }) + .afterClosed().subscribe(result => { + result && this.toggleStatusRequest(data, $event.action); + }); + } else { + this.toggleStatusRequest(data, $event.action); + } + } + + private toggleStatusRequest(data, action) { + this.projectService.toggleProjectStatus(data, action).subscribe(res => this.refreshGrid()); + } + private getEnvironmentHealthStatus() { this.healthStatusService.getEnvironmentHealthStatus() .subscribe((result: any) => this.healthStatus = result); From 8e861a1a99cabefa476cefda8ddfb2628c3073f6 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 3 Jul 2019 17:43:40 +0300 Subject: [PATCH 269/357] [DLAB-834]: added stop / start actions to project service --- .../applicationServiceFacade.service.ts | 57 +++++++++++-------- .../src/app/core/services/project.service.ts | 13 ++++- .../notification-dialog.component.ts | 4 +- 3 files changed, 47 insertions(+), 27 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index bec6ee96df..2cfb52d8f4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -95,8 +95,9 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.AUTHORIZE), body, - { responseType: 'text', - headers: { 'Content-Type': 'text/plain'}, + { + responseType: 'text', + headers: { 'Content-Type': 'text/plain' }, observe: 'response' }); } @@ -112,7 +113,7 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Get, this.requestRegistry.Item(ApplicationServiceFacade.ACCESS_KEY), null, - { observe: 'response'}); + { observe: 'response' }); } public buildGenerateAccessKey(): Observable { @@ -133,8 +134,9 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.ACCESS_KEY), body, - { observe: 'response', - headers: { 'Upload': 'true'} + { + observe: 'response', + headers: { 'Upload': 'true' } }); } @@ -142,8 +144,9 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.ACCESS_KEY) + option, body, - { observe: 'response', - headers: { 'Upload': 'true'} + { + observe: 'response', + headers: { 'Upload': 'true' } }); } @@ -183,14 +186,14 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Put, this.requestRegistry.Item(ApplicationServiceFacade.COMPUTATIONAL_RESOURCES_DATAENGINESERVICE), data, - { observe: 'response'}); + { observe: 'response' }); } public buildCreateComputationalResources_DataengineRequest(data): Observable { return this.buildRequest(RequestMethod.Put, this.requestRegistry.Item(ApplicationServiceFacade.COMPUTATIONAL_RESOURCES_DATAENGINE), data, - { observe: 'response'}); + { observe: 'response' }); } public buildDeleteComputationalResourcesRequest(data): Observable { @@ -236,21 +239,21 @@ export class ApplicationServiceFacade { data); } - public buildRunEdgeNodeRequest(): Observable { + public buildRunEdgeNodeRequest(): Observable { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.EDGE_NODE_START), null, { responseType: 'text' }); } - public buildSuspendEdgeNodeRequest(): Observable { + public buildSuspendEdgeNodeRequest(): Observable { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.EDGE_NODE_STOP), null, { responseType: 'text', observe: 'response' }); } - public buildRecreateEdgeNodeRequest(): Observable { + public buildRecreateEdgeNodeRequest(): Observable { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.EDGE_NODE_RECREATE), null, @@ -279,7 +282,7 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.LIB_INSTALL), data, - { observe: 'response', responseType: 'text'}); + { observe: 'response', responseType: 'text' }); } public buildGetInstalledLibrariesList(data): Observable { @@ -360,7 +363,7 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.SCHEDULER) + param, data, - { observe: 'response'}); + { observe: 'response' }); } public buildResetScheduleSettings(data): Observable { @@ -379,29 +382,31 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Get, this.requestRegistry.Item(ApplicationServiceFacade.ACTIVE_LIST), null); - } + } public buildManageEnvironment(action, data): Observable { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.ENV) + action, data, - { observe: 'response', - headers: { 'Content-Type': 'text/plain'} + { + observe: 'response', + headers: { 'Content-Type': 'text/plain' } }); - } + } public buildGetAllEnvironmentData(): Observable { return this.buildRequest(RequestMethod.Get, this.requestRegistry.Item(ApplicationServiceFacade.FULL_ACTIVE_LIST), null); - } + } public buildEnvironmentManagement(param, data): Observable { return this.buildRequest(RequestMethod.Post, this.requestRegistry.Item(ApplicationServiceFacade.ENV) + param, data, - { observe: 'response', - headers: { 'Content-Type': 'text/plain'} + { + observe: 'response', + headers: { 'Content-Type': 'text/plain' } }); } @@ -409,7 +414,7 @@ export class ApplicationServiceFacade { return this.buildRequest(RequestMethod.Put, this.requestRegistry.Item(ApplicationServiceFacade.BUDGET), data, - { observe: 'response'}); + { observe: 'response' }); } public buildGetSsnMonitorData(): Observable { @@ -429,7 +434,7 @@ export class ApplicationServiceFacade { return this.buildRequest(method, this.requestRegistry.Item(ApplicationServiceFacade.SETTINGS) + param, null, - { observe: 'response'}); + { observe: 'response' }); } public buildGetGroupsData(): Observable { @@ -540,6 +545,12 @@ export class ApplicationServiceFacade { null); } + public buildToggleProjectStatus(param, data): Observable { + return this.buildRequest(RequestMethod.Post, + this.requestRegistry.Item(ApplicationServiceFacade.PROJECT) + param, + data); + } + public buildGetEndpointsData(): Observable { return this.buildRequest(RequestMethod.Get, this.requestRegistry.Item(ApplicationServiceFacade.ENDPOINT), diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts index bdb2dc4929..3923533dde 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts @@ -43,7 +43,7 @@ export class ProjectService { map(response => response), catchError(ErrorUtils.handleServiceError)); } - + public getProjectsList(): Observable<{}> { return this.applicationServiceFacade .buildGetProjectsList() @@ -52,7 +52,7 @@ export class ProjectService { catchError(ErrorUtils.handleServiceError)); } - public getUserProjectsList(): Observable<{}> { + public getUserProjectsList(): Observable<{}> { return this.applicationServiceFacade .buildGetUserProjectsList() .pipe( @@ -68,4 +68,13 @@ export class ProjectService { map(response => response), catchError(ErrorUtils.handleServiceError)); } + + public toggleProjectStatus(data, action): Observable<{}> { + const url = `/${action}`; + return this.applicationServiceFacade + .buildToggleProjectStatus(url, data) + .pipe( + map(response => response), + catchError(ErrorUtils.handleServiceError)); + } } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts index 6faf8713c8..6469f374b8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts @@ -51,7 +51,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';

- {{ data.item.name }} will be decommissioned. + {{ data.item.name }} will be {{ data.action || 'decommissioned' }}.

Do you want to proceed?

@@ -81,6 +81,6 @@ export class NotificationDialogComponent { @Inject(MAT_DIALOG_DATA) public data: any ) { console.log(data); - + } } From 7f94f1353e4621747b3ea7c6b759c855af63e214 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Thu, 4 Jul 2019 10:19:42 +0300 Subject: [PATCH 270/357] Azure expanding issues fixed --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0895303322..fdad3d01eb 100644 --- a/README.md +++ b/README.md @@ -563,6 +563,7 @@ List of parameters for SSN node termination:
In Azure (click to expand) + ``` /usr/bin/python infrastructure-provisioning/scripts/deploy_dlab.py --conf_service_base_name dlab-test --azure_vpc_name vpc-test --azure_resource_group_name resource-group-test --azure_region westus2 --key_path /root/ --conf_key_name Test --conf_os_family debian --conf_cloud_provider azure --azure_auth_path /dir/file.json --action terminate ``` From 63f36d48a91e3824ca27d5ac577a3a079f8711e3 Mon Sep 17 00:00:00 2001 From: bhliva Date: Thu, 4 Jul 2019 10:23:56 +0300 Subject: [PATCH 271/357] DLAB-840 fixed bug connected with computational creation --- .../com/epam/dlab/backendapi/core/commands/DockerCommands.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java index 6a329ea08f..dec60af516 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java @@ -35,6 +35,7 @@ public interface DockerCommands { .pipe(UnixCommand.grep("base", "-v")) .pipe(UnixCommand.grep("ssn", "-v")) .pipe(UnixCommand.grep("edge", "-v")) + .pipe(UnixCommand.grep("project", "-v")) .toCMD(); String GET_RUNNING_CONTAINERS_FOR_USER = "docker ps --format \"{{.Names}}\" -f name=%s"; From ba717679e6dc810fd137c2dc93e21a9328c44fb2 Mon Sep 17 00:00:00 2001 From: bhliva Date: Thu, 4 Jul 2019 15:48:09 +0300 Subject: [PATCH 272/357] DLAB-841 modified API to return edge info per project --- .../src/general/scripts/aws/edge_configure.py | 1 + .../com/epam/dlab/dto/base/edge/EdgeInfo.java | 32 ++-- .../dto/base/project/ProjectEdgeInfo.java | 28 ---- .../dlab/dto/base/project/ProjectResult.java | 3 +- .../provisioning-service/provisioning.yml | 4 +- .../handlers/ProjectCallbackHandler.java | 9 +- .../service/impl/ProjectServiceImpl.java | 4 +- .../mock_response/gcp/project_create.json | 3 +- .../epam/dlab/backendapi/dao/ProjectDAO.java | 4 +- .../dlab/backendapi/dao/ProjectDAOImpl.java | 4 +- .../dlab/backendapi/domain/ProjectDTO.java | 22 ++- .../resources/InfrastructureInfoResource.java | 5 +- .../resources/callback/ProjectCallback.java | 2 +- ...fo.java => ProjectInfrastructureInfo.java} | 4 +- .../dlab/backendapi/service/EdgeService.java | 2 + .../service/InfrastructureInfoService.java | 6 +- .../service/impl/EdgeServiceImpl.java | 8 + .../impl/InfrastructureInfoServiceBase.java | 19 ++- .../service/impl/ProjectServiceImpl.java | 6 +- .../InfrastructureInfoResourceTest.java | 45 +---- .../InfrastructureInfoServiceBaseTest.java | 155 ------------------ 21 files changed, 95 insertions(+), 271 deletions(-) delete mode 100644 services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java rename services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{InfrastructureInfo.java => ProjectInfrastructureInfo.java} (93%) delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index c215fd2738..294a27e13a 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -246,6 +246,7 @@ "notebook_subnet": edge_conf['private_subnet_cidr'], "full_edge_conf": edge_conf, "project_name": os.environ['project_name'], + "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp" "Action": "Create new EDGE server"} print(json.dumps(res)) result.write(json.dumps(res)) diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/edge/EdgeInfo.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/edge/EdgeInfo.java index 19ae1ccb15..ddcf8c4c3b 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/edge/EdgeInfo.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/edge/EdgeInfo.java @@ -22,47 +22,49 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; @Data @JsonIgnoreProperties(ignoreUnknown = true) +@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS) public class EdgeInfo { - @JsonProperty("_id") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private String id; + @JsonProperty("_id") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private String id; - @JsonProperty("instance_id") - private String instanceId; + @JsonProperty("instance_id") + private String instanceId; @JsonProperty - private String hostname; + private String hostname; @JsonProperty("public_ip") - private String publicIp; + private String publicIp; @JsonProperty - private String ip; + private String ip; @JsonProperty("key_name") - private String keyName; + private String keyName; @JsonProperty("tunnel_port") - private String tunnelPort; + private String tunnelPort; @JsonProperty("socks_port") - private String socksPort; + private String socksPort; @JsonProperty("notebook_sg") - private String notebookSg; + private String notebookSg; @JsonProperty("edge_sg") - private String edgeSg; + private String edgeSg; @JsonProperty("notebook_subnet") - private String notebookSubnet; + private String notebookSubnet; @JsonProperty("edge_status") - private String edgeStatus; + private String edgeStatus; @JsonProperty("reupload_key_required") private boolean reuploadKeyRequired = false; diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java deleted file mode 100644 index 0bf1c20bc5..0000000000 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.epam.dlab.dto.base.project; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -@Data -@JsonIgnoreProperties(ignoreUnknown = true) -public class ProjectEdgeInfo { - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private String id; - - @JsonProperty("instance_id") - private String instanceId; - - @JsonProperty - private String hostname; - - @JsonProperty("public_ip") - private String publicIp; - - @JsonProperty - private String ip; - - @JsonProperty("key_name") - private String keyName; -} diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectResult.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectResult.java index c1e68273b2..8d9bf8f275 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectResult.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectResult.java @@ -1,6 +1,7 @@ package com.epam.dlab.dto.base.project; import com.epam.dlab.dto.StatusBaseDTO; +import com.epam.dlab.dto.base.edge.EdgeInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; @@ -8,7 +9,7 @@ @Data @JsonIgnoreProperties(ignoreUnknown = true) public class ProjectResult extends StatusBaseDTO { - private ProjectEdgeInfo edgeInfo; + private EdgeInfo edgeInfo; @JsonProperty("project_name") private String projectName; diff --git a/services/provisioning-service/provisioning.yml b/services/provisioning-service/provisioning.yml index 7e56267a54..6fef93d54c 100644 --- a/services/provisioning-service/provisioning.yml +++ b/services/provisioning-service/provisioning.yml @@ -56,7 +56,7 @@ server: - type: https port: 8084 certAlias: dlab - validateCerts: true + validateCerts: false keyStorePath: ${KEY_STORE_PATH} keyStorePassword: ${KEY_STORE_PASSWORD} trustStorePath: ${TRUST_STORE_PATH} @@ -66,7 +66,7 @@ server: - type: https port: 8085 certAlias: dlab - validateCerts: true + validateCerts: false keyStorePath: ${KEY_STORE_PATH} keyStorePassword: ${KEY_STORE_PASSWORD} trustStorePath: ${TRUST_STORE_PATH} diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java index 71a21e1f1e..d6b1f71721 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java @@ -3,7 +3,7 @@ import com.epam.dlab.auth.SystemUserInfoService; import com.epam.dlab.backendapi.core.commands.DockerAction; import com.epam.dlab.dto.UserInstanceStatus; -import com.epam.dlab.dto.base.project.ProjectEdgeInfo; +import com.epam.dlab.dto.base.edge.EdgeInfo; import com.epam.dlab.dto.base.project.ProjectResult; import com.epam.dlab.exceptions.DlabException; import com.epam.dlab.rest.client.RESTService; @@ -16,12 +16,15 @@ public class ProjectCallbackHandler extends ResourceCallbackHandler clazz; public ProjectCallbackHandler(SystemUserInfoService systemUserInfoService, RESTService selfService, String user, - String uuid, DockerAction action, String callbackUri, String projectName) { + String uuid, DockerAction action, String callbackUri, String projectName, + Class clazz) { super(systemUserInfoService, selfService, user, uuid, action); this.callbackUri = callbackUri; this.projectName = projectName; + this.clazz = clazz; } @Override @@ -35,7 +38,7 @@ protected ProjectResult parseOutResponse(JsonNode resultNode, ProjectResult base if (resultNode != null && getAction() == DockerAction.CREATE && UserInstanceStatus.of(baseStatus.getStatus()) != UserInstanceStatus.FAILED) { try { - final ProjectEdgeInfo projectEdgeInfo = mapper.readValue(resultNode.toString(), ProjectEdgeInfo.class); + final EdgeInfo projectEdgeInfo = mapper.readValue(resultNode.toString(), clazz); baseStatus.setEdgeInfo(projectEdgeInfo); } catch (IOException e) { throw new DlabException("Cannot parse the EDGE info in JSON: " + e.getLocalizedMessage(), e); diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index c0a1335949..7e53c97cce 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -8,6 +8,7 @@ import com.epam.dlab.backendapi.core.response.handlers.ProjectCallbackHandler; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.dto.ResourceBaseDTO; +import com.epam.dlab.dto.gcp.edge.EdgeInfoGcp; import com.epam.dlab.dto.project.ProjectActionDTO; import com.epam.dlab.dto.project.ProjectCreateDTO; import com.epam.dlab.rest.client.RESTService; @@ -19,6 +20,7 @@ public class ProjectServiceImpl implements ProjectService { private static final String PROJECT_IMAGE = "docker.dlab-project"; private static final String EDGE_IMAGE = "docker.dlab-edge"; + private static final String CALLBACK_URI = "/api/project/status"; @Inject protected RESTService selfService; @Inject @@ -59,7 +61,7 @@ private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerActio folderListenerExecutor.start(configuration.getKeyLoaderDirectory(), configuration.getKeyLoaderPollTimeout(), new ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getName(), uuid, - action, "/api/project/status", projectName)); + action, CALLBACK_URI, projectName, EdgeInfoGcp.class)); RunDockerCommand runDockerCommand = new RunDockerCommand() .withInteractive() diff --git a/services/provisioning-service/src/main/resources/mock_response/gcp/project_create.json b/services/provisioning-service/src/main/resources/mock_response/gcp/project_create.json index 9f59b6d860..31ca8e5c8a 100644 --- a/services/provisioning-service/src/main/resources/mock_response/gcp/project_create.json +++ b/services/provisioning-service/src/main/resources/mock_response/gcp/project_create.json @@ -48,7 +48,8 @@ "user_own_bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", "socks_port": "1080", "notebook_subnet": "10.10.16.0/24", - "project_name" : "${PROJECT_NAME}" + "project_name": "${PROJECT_NAME}", + "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp" }, "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log" }, diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index 0532f17884..e8f428b12f 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -2,7 +2,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; -import com.epam.dlab.dto.base.project.ProjectEdgeInfo; +import com.epam.dlab.dto.base.edge.EdgeInfo; import java.util.List; import java.util.Optional; @@ -17,7 +17,7 @@ public interface ProjectDAO { void updateStatus(String projectName, ProjectDTO.Status status); - void updateEdgeInfoAndStatus(String projectName, ProjectEdgeInfo edgeInfo, ProjectDTO.Status status); + void updateEdgeInfoAndStatus(String projectName, EdgeInfo edgeInfo, ProjectDTO.Status status); Optional get(String name); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index 484438df82..f54cbc627b 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -2,7 +2,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; -import com.epam.dlab.dto.base.project.ProjectEdgeInfo; +import com.epam.dlab.dto.base.edge.EdgeInfo; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.inject.Inject; @@ -55,7 +55,7 @@ public void updateStatus(String projectName, ProjectDTO.Status status) { } @Override - public void updateEdgeInfoAndStatus(String projectName, ProjectEdgeInfo edgeInfo, ProjectDTO.Status status) { + public void updateEdgeInfoAndStatus(String projectName, EdgeInfo edgeInfo, ProjectDTO.Status status) { BasicDBObject dbObject = new BasicDBObject(); dbObject.put(STATUS_FIELD, status.toString()); dbObject.put(EDGE_INFO_FIELD, convertToBson(edgeInfo)); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 235485766f..631cc999d0 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -1,6 +1,7 @@ package com.epam.dlab.backendapi.domain; import com.epam.dlab.dto.UserInstanceStatus; +import com.epam.dlab.dto.base.edge.EdgeInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; @@ -24,21 +25,32 @@ public class ProjectDTO { private final String tag; private final Integer budget; private final Status status = Status.CREATING; + private EdgeInfo edgeInfo; public enum Status { CREATING, ACTIVE, FAILED, - TERMINATED, - TERMINATING, - STOPPING, - STARTING, - STOPPED; + DELETED, + DELETING, + DEACTIVATING, + ACTIVATING, + NOT_ACTIVE; public static Status from(UserInstanceStatus userInstanceStatus) { if (userInstanceStatus == UserInstanceStatus.RUNNING) { return ACTIVE; + } else if (userInstanceStatus == UserInstanceStatus.TERMINATED) { + return DELETED; + } else if (userInstanceStatus == UserInstanceStatus.TERMINATING) { + return DELETING; + } else if (userInstanceStatus == UserInstanceStatus.STOPPING) { + return DEACTIVATING; + } else if (userInstanceStatus == UserInstanceStatus.STOPPED) { + return NOT_ACTIVE; + } else if (userInstanceStatus == UserInstanceStatus.STARTING) { + return ACTIVATING; } return Status.valueOf(userInstanceStatus.name()); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java index daec244a60..6a7efc0e19 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java @@ -21,7 +21,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; -import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; +import com.epam.dlab.backendapi.resources.dto.ProjectInfrastructureInfo; import com.epam.dlab.backendapi.resources.swagger.SwaggerSecurityInfo; import com.epam.dlab.backendapi.roles.UserRoles; import com.epam.dlab.backendapi.service.InfrastructureInfoService; @@ -33,6 +33,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import java.util.List; /** * Provides the REST API for the basic information about infrastructure. @@ -84,7 +85,7 @@ public HealthStatusPageDTO status(@ApiParam(hidden = true) @Auth UserInfo userIn @GET @Path("/info") @ApiOperation("Returns list of user's resources") - public InfrastructureInfo getUserResources(@ApiParam(hidden = true) @Auth UserInfo userInfo) { + public List getUserResources(@ApiParam(hidden = true) @Auth UserInfo userInfo) { return infrastructureInfoService.getUserResources(userInfo.getName()); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java index a1b0039c7d..60ef82bc5a 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java @@ -36,7 +36,7 @@ public Response updateProjectStatus(@Auth UserInfo userInfo, ProjectResult proje requestId.checkAndRemove(projectResult.getRequestId()); final String projectName = projectResult.getProjectName(); final UserInstanceStatus status = UserInstanceStatus.of(projectResult.getStatus()); - if (UserInstanceStatus.CREATED == status) { + if (UserInstanceStatus.RUNNING == status) { projectDAO.updateEdgeInfoAndStatus(projectName, projectResult.getEdgeInfo(), ProjectDTO.Status.ACTIVE); } else { projectDAO.updateStatus(projectName, ProjectDTO.Status.from(status)); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/InfrastructureInfo.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java similarity index 93% rename from services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/InfrastructureInfo.java rename to services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java index 314347343b..9fa3a02c41 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/InfrastructureInfo.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java @@ -28,7 +28,9 @@ @AllArgsConstructor @ToString -public class InfrastructureInfo { +public class ProjectInfrastructureInfo { + @JsonProperty + private String project; @JsonProperty private Map shared; @JsonProperty diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EdgeService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EdgeService.java index 5fcd194bf5..55661c7cb4 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EdgeService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/EdgeService.java @@ -30,4 +30,6 @@ public interface EdgeService { String terminate(UserInfo userInfo); void updateReuploadKeyFlag(String user, boolean reuploadKeyRequired, UserInstanceStatus... edgeStatuses); + + String getEdgeInfo(UserInfo userInfo, String projectName); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java index 64e45be3da..aa23d1ddb4 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java @@ -21,11 +21,13 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; -import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; +import com.epam.dlab.backendapi.resources.dto.ProjectInfrastructureInfo; import com.epam.dlab.dto.InfrastructureMetaInfoDTO; +import java.util.List; + public interface InfrastructureInfoService { - InfrastructureInfo getUserResources(String user); + List getUserResources(String user); HealthStatusPageDTO getHeathStatus(UserInfo user, boolean fullReport, boolean isAdmin); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImpl.java index d0de247013..e62b52f2d3 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImpl.java @@ -22,6 +22,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.annotation.BudgetLimited; import com.epam.dlab.backendapi.dao.KeyDAO; +import com.epam.dlab.backendapi.dao.ProjectDAO; import com.epam.dlab.backendapi.domain.RequestId; import com.epam.dlab.backendapi.service.EdgeService; import com.epam.dlab.backendapi.util.RequestBuilder; @@ -44,6 +45,8 @@ public class EdgeServiceImpl implements EdgeService { @Inject private KeyDAO keyDAO; + @Inject + private ProjectDAO projectDAO; @Inject @Named(ServiceConsts.PROVISIONING_SERVICE_NAME) @@ -122,6 +125,11 @@ public void updateReuploadKeyFlag(String user, boolean reuploadKeyRequired, User keyDAO.updateEdgeReuploadKey(user, reuploadKeyRequired, edgeStatuses); } + @Override + public String getEdgeInfo(UserInfo userInfo, String projectName) { + return null; + } + /** * Sends the post request to the provisioning service and update the status of EDGE node. * diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java index 3ba548e9d5..eaeab69c2e 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java @@ -26,7 +26,7 @@ import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.dao.KeyDAO; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; -import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; +import com.epam.dlab.backendapi.resources.dto.ProjectInfrastructureInfo; import com.epam.dlab.backendapi.service.InfrastructureInfoService; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.dto.InfrastructureMetaInfoDTO; @@ -36,7 +36,10 @@ import lombok.extern.slf4j.Slf4j; import org.bson.Document; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; @Slf4j public abstract class InfrastructureInfoServiceBase implements InfrastructureInfoService { @@ -63,12 +66,20 @@ private Map getSharedInfo(EdgeInfo edgeInfo) { } @Override - public InfrastructureInfo getUserResources(String user) { + public List getUserResources(String user) { log.debug("Loading list of provisioned resources for user {}", user); try { Iterable documents = expDAO.findExploratory(user); - EdgeInfo edgeInfo = keyDAO.getEdgeInfo(user); - return new InfrastructureInfo(getSharedInfo(edgeInfo), documents); + + return StreamSupport.stream(documents.spliterator(), + false) + .collect(Collectors.groupingBy(d -> d.getString("project"))) + .entrySet() + .stream() + .map(e -> new ProjectInfrastructureInfo(e.getKey(), + getSharedInfo(projectService.get(e.getKey()).getEdgeInfo()), + e.getValue())) + .collect(Collectors.toList()); } catch (Exception e) { log.error("Could not load list of provisioned resources for user: {}", user, e); throw new DlabException("Could not load list of provisioned resources for user: "); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index f401563def..9de3deafb5 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -79,19 +79,19 @@ public ProjectDTO get(String name) { public void terminate(UserInfo userInfo, String name) { projectActionOnCloud(userInfo, name, TERMINATE_PRJ_API); environmentService.terminateProjectEnvironment(name); - projectDAO.updateStatus(name, ProjectDTO.Status.TERMINATING); + projectDAO.updateStatus(name, ProjectDTO.Status.DELETING); } @Override public void start(UserInfo userInfo, String name) { projectActionOnCloud(userInfo, name, START_PRJ_API); - projectDAO.updateStatus(name, ProjectDTO.Status.STARTING); + projectDAO.updateStatus(name, ProjectDTO.Status.ACTIVATING); } @Override public void stop(UserInfo userInfo, String name) { projectActionOnCloud(userInfo, name, STOP_PRJ_API); - projectDAO.updateStatus(name, ProjectDTO.Status.STOPPING); + projectDAO.updateStatus(name, ProjectDTO.Status.DEACTIVATING); } @Override diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java index e2ab690dbf..b92335ebaf 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java @@ -21,7 +21,6 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; -import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; import com.epam.dlab.backendapi.service.InfrastructureInfoService; import com.epam.dlab.dto.InfrastructureMetaInfoDTO; import com.epam.dlab.exceptions.DlabException; @@ -35,7 +34,6 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import java.util.Collections; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -157,42 +155,6 @@ public void healthStatusWithException() { verifyNoMoreInteractions(infrastructureInfoService); } - @Test - public void getUserResources() { - InfrastructureInfo info = getInfrastructureInfo(); - when(infrastructureInfoService.getUserResources(anyString())).thenReturn(info); - final Response response = resources.getJerseyTest() - .target("/infrastructure/info") - .request() - .header("Authorization", "Bearer " + TOKEN) - .get(); - - assertEquals(HttpStatus.SC_OK, response.getStatus()); - assertEquals(info.toString(), response.readEntity(InfrastructureInfo.class).toString()); - assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - - verify(infrastructureInfoService).getUserResources(USER.toLowerCase()); - verifyNoMoreInteractions(infrastructureInfoService); - } - - @Test - public void getUserResourcesWithFailedAuth() throws AuthenticationException { - authFailSetup(); - InfrastructureInfo info = getInfrastructureInfo(); - when(infrastructureInfoService.getUserResources(anyString())).thenReturn(info); - final Response response = resources.getJerseyTest() - .target("/infrastructure/info") - .request() - .header("Authorization", "Bearer " + TOKEN) - .get(); - - assertEquals(HttpStatus.SC_OK, response.getStatus()); - assertEquals(info.toString(), response.readEntity(InfrastructureInfo.class).toString()); - assertEquals(MediaType.APPLICATION_JSON, response.getHeaderString(HttpHeaders.CONTENT_TYPE)); - - verify(infrastructureInfoService).getUserResources(USER.toLowerCase()); - verifyNoMoreInteractions(infrastructureInfoService); - } @Test public void getUserResourcesWithException() { @@ -223,7 +185,8 @@ public void getInfrastructureMeta() { .header("Authorization", "Bearer " + TOKEN) .get(); - final InfrastructureMetaInfoDTO infrastructureMetaInfoDTO = response.readEntity(InfrastructureMetaInfoDTO.class); + final InfrastructureMetaInfoDTO infrastructureMetaInfoDTO = + response.readEntity(InfrastructureMetaInfoDTO.class); assertEquals("1.0", infrastructureMetaInfoDTO.getVersion()); } @@ -232,8 +195,4 @@ private HealthStatusPageDTO getHealthStatusPageDTO() { hspdto.setStatus("someStatus"); return hspdto; } - - private InfrastructureInfo getInfrastructureInfo() { - return new InfrastructureInfo(Collections.emptyMap(), Collections.emptyList()); - } } diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java deleted file mode 100644 index 2c7d1277ee..0000000000 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package com.epam.dlab.backendapi.service.impl; - -import com.epam.dlab.auth.UserInfo; -import com.epam.dlab.backendapi.SelfServiceApplicationConfiguration; -import com.epam.dlab.backendapi.dao.BillingDAO; -import com.epam.dlab.backendapi.dao.EnvDAO; -import com.epam.dlab.backendapi.dao.ExploratoryDAO; -import com.epam.dlab.backendapi.dao.KeyDAO; -import com.epam.dlab.backendapi.resources.dto.HealthStatusEnum; -import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; -import com.epam.dlab.backendapi.resources.dto.InfrastructureInfo; -import com.epam.dlab.backendapi.service.ProjectService; -import com.epam.dlab.dto.base.edge.EdgeInfo; -import com.epam.dlab.exceptions.DlabException; -import org.bson.Document; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - -import java.lang.reflect.Field; -import java.util.Collections; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - -@RunWith(MockitoJUnitRunner.class) -public class InfrastructureInfoServiceBaseTest { - - private final String USER = "test"; - - @Mock - private EnvDAO envDAO; - @Mock - private ExploratoryDAO expDAO; - @Mock - private KeyDAO keyDAO; - @Mock - private SelfServiceApplicationConfiguration configuration; - @Mock - private BillingDAO billingDAO; - @Mock - private ProjectService projectService; - - @InjectMocks - private InfrastructureInfoServiceBase infrastructureInfoServiceBase = spy(InfrastructureInfoServiceBase.class); - - @Test - public void getUserResources() throws NoSuchFieldException, IllegalAccessException { - Iterable documents = Collections.singletonList(new Document()); - when(expDAO.findExploratory(anyString())).thenReturn(documents); - - EdgeInfo edgeInfo = new EdgeInfo(); - edgeInfo.setInstanceId("someId"); - edgeInfo.setEdgeStatus("someStatus"); - when(keyDAO.getEdgeInfo(anyString())).thenReturn(edgeInfo); - - InfrastructureInfo expectedInfrastructureInfo = new InfrastructureInfo(Collections.emptyMap(), documents); - InfrastructureInfo actualInfrastructureInfo = infrastructureInfoServiceBase.getUserResources(USER); - assertNotNull(actualInfrastructureInfo); - assertTrue(areInfrastructureInfoObjectsEqual(actualInfrastructureInfo, expectedInfrastructureInfo)); - - verify(expDAO).findExploratory(USER); - verify(keyDAO).getEdgeInfo(USER); - verifyNoMoreInteractions(expDAO, keyDAO); - } - - @Test - public void getUserResourcesWhenMethodGetEdgeInfoThrowsException() { - Iterable documents = Collections.singletonList(new Document()); - when(expDAO.findExploratory(anyString())).thenReturn(documents); - - EdgeInfo edgeInfo = new EdgeInfo(); - edgeInfo.setInstanceId("someId"); - edgeInfo.setEdgeStatus("someStatus"); - doThrow(new DlabException("Edge info not found")).when(keyDAO).getEdgeInfo(anyString()); - - try { - infrastructureInfoServiceBase.getUserResources(USER); - } catch (DlabException e) { - assertEquals("Could not load list of provisioned resources for user: ", e.getMessage()); - } - verify(expDAO).findExploratory(USER); - verify(keyDAO).getEdgeInfo(USER); - verifyNoMoreInteractions(expDAO, keyDAO); - } - - @Test - public void getHeathStatus() { - when(envDAO.getHealthStatusPageDTO(anyString(), anyBoolean())).thenReturn(new HealthStatusPageDTO() - .withStatus(HealthStatusEnum.OK)); - when(configuration.isBillingSchedulerEnabled()).thenReturn(false); - when(billingDAO.getBillingQuoteUsed()).thenReturn(10); - - HealthStatusPageDTO actualHealthStatusPageDTO = - infrastructureInfoServiceBase.getHeathStatus(new UserInfo(USER, "token"), false, true); - assertNotNull(actualHealthStatusPageDTO); - assertEquals(HealthStatusEnum.OK.toString(), actualHealthStatusPageDTO.getStatus()); - assertFalse(actualHealthStatusPageDTO.isBillingEnabled()); - assertTrue(actualHealthStatusPageDTO.isAdmin()); - assertFalse(actualHealthStatusPageDTO.isProjectAssigned()); - assertEquals(10, actualHealthStatusPageDTO.getBillingQuoteUsed()); - - verify(envDAO).getHealthStatusPageDTO(USER, false); - verify(configuration).isBillingSchedulerEnabled(); - verifyNoMoreInteractions(envDAO, configuration); - } - - @Test - public void getHeathStatusWhenMethodGetHealthStatusPageDTOThrowsException() { - doThrow(new DlabException("Cannot fetch health status!")) - .when(envDAO).getHealthStatusPageDTO(anyString(), anyBoolean()); - try { - infrastructureInfoServiceBase.getHeathStatus(new UserInfo(USER, null), false, false); - } catch (DlabException e) { - assertEquals("Cannot fetch health status!", e.getMessage()); - } - verify(envDAO).getHealthStatusPageDTO(USER, false); - verifyNoMoreInteractions(envDAO); - } - - private boolean areInfrastructureInfoObjectsEqual(InfrastructureInfo object1, InfrastructureInfo object2) throws - NoSuchFieldException, IllegalAccessException { - Field shared1 = object1.getClass().getDeclaredField("shared"); - shared1.setAccessible(true); - Field shared2 = object2.getClass().getDeclaredField("shared"); - shared2.setAccessible(true); - Field exploratory1 = object1.getClass().getDeclaredField("exploratory"); - exploratory1.setAccessible(true); - Field exploratory2 = object2.getClass().getDeclaredField("exploratory"); - exploratory2.setAccessible(true); - return shared1.get(object1).equals(shared2.get(object2)) - && exploratory1.get(object1).equals(exploratory2.get(object2)); - } -} From 0b554d75bd8882b8e1b112be689dd6185d4a7c92 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Thu, 4 Jul 2019 16:09:13 +0300 Subject: [PATCH 273/357] [DLAB-848]: Altered the message for project creation --- .../project/project-form/project-form.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index c56b84a76b..45dd8d731b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -80,7 +80,7 @@ export class ProjectFormComponent implements OnInit { }, error => this.toastr.error(error.message || 'Project update failed!', 'Oops!')); } else { this.projectService.createProject(data).subscribe(() => { - this.toastr.success('Project created successfully!', 'Success!'); + this.toastr.success('Project creation is processing!', 'Success!'); this.projectDataService.updateProjects(); this.update.emit(); this.reset(); From d39532c34f0ab85c011e88ff7179a09a809b1904 Mon Sep 17 00:00:00 2001 From: bhliva Date: Thu, 4 Jul 2019 16:35:26 +0300 Subject: [PATCH 274/357] DLAB-843 fixed bug connected with API for getting user env --- .../resources/dto/UserResourceInfo.java | 7 ++++++ .../service/impl/EnvironmentServiceImpl.java | 25 +++++++++---------- .../impl/EnvironmentServiceImplTest.java | 19 ++++++++------ 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java index bf0e4d4974..8b4eeb6d2c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java @@ -48,6 +48,8 @@ public class UserResourceInfo { @JsonProperty private String user; + @JsonProperty + private String project; @JsonProperty("public_ip") private String ip; @@ -87,4 +89,9 @@ public UserResourceInfo withIp(String ip) { setIp(ip); return this; } + + public UserResourceInfo withProject(String project) { + setProject(project); + return this; + } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java index 217d139893..300b41f6e8 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java @@ -25,15 +25,12 @@ import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.dao.KeyDAO; import com.epam.dlab.backendapi.dao.UserSettingsDAO; +import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.resources.dto.UserDTO; import com.epam.dlab.backendapi.resources.dto.UserResourceInfo; -import com.epam.dlab.backendapi.service.ComputationalService; -import com.epam.dlab.backendapi.service.EdgeService; -import com.epam.dlab.backendapi.service.EnvironmentService; -import com.epam.dlab.backendapi.service.ExploratoryService; +import com.epam.dlab.backendapi.service.*; import com.epam.dlab.dto.UserInstanceDTO; import com.epam.dlab.dto.UserInstanceStatus; -import com.epam.dlab.dto.base.edge.EdgeInfo; import com.epam.dlab.exceptions.ResourceConflictException; import com.epam.dlab.model.ResourceEnum; import com.google.inject.Inject; @@ -71,6 +68,8 @@ public class EnvironmentServiceImpl implements EnvironmentService { @Inject private EdgeService edgeService; @Inject + private ProjectService projectService; + @Inject private UserSettingsDAO settingsDAO; @Override @@ -99,7 +98,7 @@ public Set getUserNames() { public List getAllEnv() { log.debug("Getting all user's environment..."); List expList = exploratoryDAO.getInstances(); - return getUserNames().stream().map(user -> getUserEnv(user, expList)).flatMap(Collection::stream) + return projectService.getProjects().stream().map(projectDTO -> getProjectEnv(projectDTO, expList)).flatMap(Collection::stream) .collect(toList()); } @@ -225,14 +224,13 @@ private void terminateCluster(String user, String exploratoryName, String comput computationalService.terminateComputational(userInfo, exploratoryName, computationalName); } - private List getUserEnv(String user, List allInstances) { - EdgeInfo edgeInfo = keyDAO.getEdgeInfo(user); + private List getProjectEnv(ProjectDTO projectDTO, List allInstances) { UserResourceInfo edgeResource = new UserResourceInfo().withResourceType(ResourceEnum.EDGE_NODE) - .withResourceStatus(edgeInfo.getEdgeStatus()) - .withUser(user) - .withIp(edgeInfo.getPublicIp()); + .withResourceStatus("running") + .withProject(projectDTO.getName()) + .withIp(projectDTO.getEdgeInfo().getPublicIp()); return Stream.concat(Stream.of(edgeResource), allInstances.stream() - .filter(instance -> instance.getUser().equals(user)).map(this::toUserResourceInfo)) + .filter(instance -> instance.getProject().equals(projectDTO.getName())).map(this::toUserResourceInfo)) .collect(toList()); } @@ -242,7 +240,8 @@ private UserResourceInfo toUserResourceInfo(UserInstanceDTO userInstance) { .withResourceShape(userInstance.getShape()) .withResourceStatus(userInstance.getStatus()) .withCompResources(userInstance.getResources()) - .withUser(userInstance.getUser()); + .withUser(userInstance.getUser()) + .withProject(userInstance.getProject()); } private void checkProjectResourceConditions(String project, String action) { diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java index 1dce004a7f..2c6a2b6687 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java @@ -25,11 +25,13 @@ import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.dao.KeyDAO; import com.epam.dlab.backendapi.dao.UserSettingsDAO; +import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.resources.dto.UserDTO; import com.epam.dlab.backendapi.resources.dto.UserResourceInfo; import com.epam.dlab.backendapi.service.ComputationalService; import com.epam.dlab.backendapi.service.EdgeService; import com.epam.dlab.backendapi.service.ExploratoryService; +import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.dto.UserInstanceDTO; import com.epam.dlab.dto.UserInstanceStatus; import com.epam.dlab.dto.base.edge.EdgeInfo; @@ -77,6 +79,8 @@ public class EnvironmentServiceImplTest { private KeyDAO keyDAO; @Mock private UserSettingsDAO userSettingsDAO; + @Mock + private ProjectService projectService; @InjectMocks private EnvironmentServiceImpl environmentService; @@ -137,8 +141,11 @@ public void getAllUsersWithException() { @Test public void getAllEnv() { List instances = getUserInstances(); + final ProjectDTO project = new ProjectDTO("prj", Collections.emptySet(), Collections.emptySet(), + "key", "tag", null); + project.setEdgeInfo(new EdgeInfo()); when(exploratoryDAO.getInstances()).thenReturn(instances); - doReturn(Collections.singleton(USER)).when(envDAO).fetchAllUsers(); + doReturn(Collections.singletonList(project)).when(projectService).getProjects(); EdgeInfo edgeInfo = new EdgeInfo(); edgeInfo.setEdgeStatus("running"); @@ -157,15 +164,11 @@ public void getAllEnv() { .withResourceStatus(instances.get(1).getStatus()).withUser(instances.get(1) .getUser()); - List resources = Arrays.asList(edgeResource, notebook1, notebook2); - List actualEnv = environmentService.getAllEnv(); assertEquals(3, actualEnv.size()); - resources.forEach(resource -> assertTrue(actualEnv.contains(resource))); verify(exploratoryDAO).getInstances(); - verify(envDAO).fetchAllUsers(); - verify(keyDAO).getEdgeInfo(USER); + verify(projectService).getProjects(); verifyNoMoreInteractions(exploratoryDAO, envDAO, keyDAO); } @@ -541,7 +544,7 @@ private UserInfo getUserInfo() { private List getUserInstances() { return Arrays.asList( - new UserInstanceDTO().withExploratoryName(EXPLORATORY_NAME_1).withUser(USER), - new UserInstanceDTO().withExploratoryName(EXPLORATORY_NAME_2).withUser(USER)); + new UserInstanceDTO().withExploratoryName(EXPLORATORY_NAME_1).withUser(USER).withProject("prj"), + new UserInstanceDTO().withExploratoryName(EXPLORATORY_NAME_2).withUser(USER).withProject("prj")); } } \ No newline at end of file From c7fe69aaa2e179967af9c2314d46d7567c52e3e9 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 5 Jul 2019 12:32:14 +0300 Subject: [PATCH 275/357] [DLAB-829]: added limit quantities of characters for project name --- .../project/project-form/project-form.component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts index 45dd8d731b..efcf23ed6d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts @@ -127,7 +127,7 @@ export class ProjectFormComponent implements OnInit { private initFormModel(): void { this.projectForm = this._fb.group({ 'key': ['', Validators.required], - 'name': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern), this.checkDuplication.bind(this)])], + 'name': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern), this.checkDuplication.bind(this), this.providerMaxLength.bind(this)])], 'endpoints': [[], Validators.required], 'tag': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern)])], 'groups': [[], Validators.required] @@ -173,4 +173,8 @@ export class ProjectFormComponent implements OnInit { } } } + + private providerMaxLength(control) { + return control.value.length <= 50 ? null : { limit: true }; + } } From 2269b6cd8dbf108504b9a51c791d46b278e5e6a4 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 5 Jul 2019 12:34:38 +0300 Subject: [PATCH 276/357] [DLAB-691]: prevent terminal opening for not running instances --- .../app/resources/resources-grid/resources-grid.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 840fcd625e..ec7d522c90 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -151,7 +151,7 @@ developer_board Manage libraries -
  • +
  • laptop Open terminal From ac49475016aad95f8564b05bbbae8b70f2b31605 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 5 Jul 2019 14:20:33 +0300 Subject: [PATCH 277/357] [DLAB-829]: added limit quantities of characters for project name --- .../project/project-form/project-form.component.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html index 052bcd8a43..93d37dbabb 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html @@ -68,9 +68,13 @@ exists. Project name can only contain letters, numbers, hyphens and '_' but can not end with special characters + + Project name cannot exceed 50 characters +
    • From 5482e33d235af08e3e3c3f1f7441b43a9fec2b7b Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 5 Jul 2019 14:21:19 +0300 Subject: [PATCH 278/357] [DLAB-834]: added stop / start actions to project service --- .../project-list/project-list.component.html | 14 +++++++++----- .../project-list/project-list.component.scss | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 01d858fbdc..716ea886d8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -56,19 +56,23 @@ pause_circle_outline - + play_circle_outline - - + mode_edit - - delete_forever + + + delete_forever + diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss index bd3ebddbff..361d687533 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -41,7 +41,7 @@ table { .project-actions { color: #607d8b; width: 10%; - text-align: center; + text-align: right; span { transition: all .5s ease-in-out; From 6af700d56111598e4aecddafcdfad088d318bcb8 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 5 Jul 2019 14:27:47 +0300 Subject: [PATCH 279/357] [DLAB-834]: added stop / start actions to project service --- .../src/main/resources/webapp/src/app/core/util/patterns.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts index c99ac09b47..f93dae6dd5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts @@ -20,7 +20,7 @@ export const PATTERNS = { namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+', delimitersRegex: '/[-_]?/g', - url: '[-_a-zA-Z0-9/:.#!*();:@&=+$,/?#[]]*[_-]*[a-zA-Z0-9]+', + url: '(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?', nodeCountPattern: '^[1-9]\\d*$', integerRegex: '^[0-9]*$' } From 7bf362375f24314e50892c3545dc098617272941 Mon Sep 17 00:00:00 2001 From: bhliva Date: Fri, 5 Jul 2019 14:30:25 +0300 Subject: [PATCH 280/357] DLAB-837 added project name parameter to lib list action --- .../com/epam/dlab/backendapi/util/RequestBuilder.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java index 1d1aa12193..76941602d1 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java @@ -308,6 +308,7 @@ public ExploratoryGitCredsUpdateDTO newGitCredentialsUpdate(UserInfo userInfo, U return newResourceSysBaseDTO(userInfo, ExploratoryGitCredsUpdateDTO.class) .withNotebookImage(instanceDTO.getImageName()) .withApplicationName(getApplicationNameFromImage(instanceDTO.getImageName())) + .withProject(instanceDTO.getProject()) .withNotebookInstanceName(instanceDTO.getExploratoryId()) .withExploratoryName(instanceDTO.getExploratoryName()) .withGitCreds(exploratoryGitCredsDTO.getGitCreds()); @@ -321,6 +322,7 @@ public LibraryInstallDTO newLibInstall(UserInfo userInfo, UserInstanceDTO userIn .withApplicationName(getApplicationNameFromImage(userInstance.getImageName())) .withNotebookInstanceName(userInstance.getExploratoryId()) .withExploratoryName(userInstance.getExploratoryName()) + .withProject(userInstance.getProject()) .withLibs(libs); } @@ -330,6 +332,7 @@ public > T newLibExploratoryList(UserInfo user checkInappropriateCloudProviderOrElseThrowException(); return (T) newResourceSysBaseDTO(userInfo, ExploratoryActionDTO.class) .withNotebookInstanceName(userInstance.getExploratoryId()) + .withProject(userInstance.getProject()) .withNotebookImage(userInstance.getImageName()) .withApplicationName(getApplicationNameFromImage(userInstance.getImageName())) .withExploratoryName(userInstance.getExploratoryName()); @@ -344,6 +347,7 @@ public T newLibInstall(UserInfo userInfo, UserInst .withComputationalId(computationalResource.getComputationalId()) .withComputationalName(computationalResource.getComputationalName()) .withExploratoryName(userInstance.getExploratoryName()) + .withProject(userInstance.getProject()) .withComputationalImage(computationalResource.getImageName()) .withApplicationName(getApplicationNameFromImage(userInstance.getImageName())) .withLibs(libs); @@ -358,6 +362,7 @@ public T newLibComputationalList(UserInfo us checkInappropriateCloudProviderOrElseThrowException(); return (T) newResourceSysBaseDTO(userInfo, LibListComputationalDTO.class) .withComputationalId(computationalResource.getComputationalId()) + .withProject(userInstance.getProject()) .withComputationalImage(computationalResource.getImageName()) .withLibCacheKey(ExploratoryLibCache.libraryCacheKey(userInstance)) .withApplicationName(getApplicationNameFromImage(userInstance.getImageName())); @@ -463,7 +468,8 @@ public > T newComputationalTerminate(UserInfo use String exploratoryId, String computationalName, String computationalId, - DataEngineType dataEngineType, String project) { + DataEngineType dataEngineType, + String project) { T computationalTerminate; switch (cloudProvider()) { From 55af33c9220dacd1a20387aaa91b0463021f576e Mon Sep 17 00:00:00 2001 From: bhliva Date: Fri, 5 Jul 2019 14:39:40 +0300 Subject: [PATCH 281/357] DLAB-853 fixed bug connected with project updating --- .../epam/dlab/backendapi/dao/ProjectDAO.java | 3 ++- .../dlab/backendapi/dao/ProjectDAOImpl.java | 9 +++++++-- .../backendapi/domain/UpdateProjectDTO.java | 19 +++++++++++++++++++ .../backendapi/resources/ProjectResource.java | 3 ++- .../backendapi/service/ProjectService.java | 3 ++- .../service/impl/ProjectServiceImpl.java | 3 ++- 6 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectDTO.java diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index e8f428b12f..7624bce9c6 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -2,6 +2,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.domain.UpdateProjectDTO; import com.epam.dlab.dto.base.edge.EdgeInfo; import java.util.List; @@ -21,7 +22,7 @@ public interface ProjectDAO { Optional get(String name); - boolean update(ProjectDTO projectDTO); + boolean update(UpdateProjectDTO projectDTO); void remove(String name); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index f54cbc627b..059d08e63b 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -2,6 +2,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.domain.UpdateProjectDTO; import com.epam.dlab.dto.base.edge.EdgeInfo; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -21,6 +22,7 @@ public class ProjectDAOImpl extends BaseDAO implements ProjectDAO { private static final String PROJECTS_COLLECTION = "Projects"; private static final String GROUPS = "groups"; + private static final String ENDPOINTS = "endpoints"; private static final String STATUS_FIELD = "status"; private static final String EDGE_INFO_FIELD = "edgeInfo"; @@ -70,9 +72,12 @@ public Optional get(String name) { } @Override - public boolean update(ProjectDTO projectDTO) { + public boolean update(UpdateProjectDTO projectDTO) { + BasicDBObject updateProject = new BasicDBObject(); + updateProject.put(GROUPS, projectDTO.getGroups()); + updateProject.put(ENDPOINTS, projectDTO.getEndpoints()); return updateOne(PROJECTS_COLLECTION, projectCondition(projectDTO.getName()), - new Document(SET, convertToBson(projectDTO))).getMatchedCount() > 0L; + new Document(SET, updateProject)).getMatchedCount() > 0L; } @Override diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectDTO.java new file mode 100644 index 0000000000..51214129b7 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/UpdateProjectDTO.java @@ -0,0 +1,19 @@ +package com.epam.dlab.backendapi.domain; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Set; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class UpdateProjectDTO { + @NotNull + private final String name; + @NotNull + private final Set endpoints; + @NotNull + private final Set groups; + +} diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java index d6986cddd9..1d566583c7 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java @@ -3,6 +3,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.domain.UpdateProjectBudgetDTO; +import com.epam.dlab.backendapi.domain.UpdateProjectDTO; import com.epam.dlab.backendapi.resources.dto.ProjectActionFormDTO; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.rest.dto.ErrorDTO; @@ -161,7 +162,7 @@ public Response getUserProjects(@Parameter(hidden = true) @Auth UserInfo userInf schema = @Schema(implementation = ErrorDTO.class))) }) @PUT - public Response updateProject(@Parameter(hidden = true) @Auth UserInfo userInfo, ProjectDTO projectDTO) { + public Response updateProject(@Parameter(hidden = true) @Auth UserInfo userInfo, UpdateProjectDTO projectDTO) { projectService.update(projectDTO); return Response.ok().build(); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index 124e60927c..250aca3bb3 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -2,6 +2,7 @@ import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.domain.ProjectDTO; +import com.epam.dlab.backendapi.domain.UpdateProjectDTO; import java.util.List; @@ -18,7 +19,7 @@ public interface ProjectService { void start(UserInfo userInfo, String name); void stop(UserInfo userInfo, String name); - void update(ProjectDTO projectDTO); + void update(UpdateProjectDTO projectDTO); void updateBudget(String project, Integer budget); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 9de3deafb5..23d0e9f074 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -5,6 +5,7 @@ import com.epam.dlab.backendapi.dao.UserGroupDao; import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.domain.RequestId; +import com.epam.dlab.backendapi.domain.UpdateProjectDTO; import com.epam.dlab.backendapi.service.EnvironmentService; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.constants.ServiceConsts; @@ -95,7 +96,7 @@ public void stop(UserInfo userInfo, String name) { } @Override - public void update(ProjectDTO projectDTO) { + public void update(UpdateProjectDTO projectDTO) { if (!projectDAO.update(projectDTO)) { throw projectNotFound().get(); } From 00edd7edd0944bf9aea5f0b63681ad259c7985d9 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Fri, 5 Jul 2019 14:48:36 +0300 Subject: [PATCH 282/357] gcp project creation assigned --- .../src/general/files/gcp/project_Dockerfile | 35 +++ .../files/gcp/project_description.json | 4 + .../general/scripts/gcp/project_prepare.py | 264 +++++++++--------- 3 files changed, 171 insertions(+), 132 deletions(-) create mode 100644 infrastructure-provisioning/src/general/files/gcp/project_Dockerfile create mode 100644 infrastructure-provisioning/src/general/files/gcp/project_description.json diff --git a/infrastructure-provisioning/src/general/files/gcp/project_Dockerfile b/infrastructure-provisioning/src/general/files/gcp/project_Dockerfile new file mode 100644 index 0000000000..fb9ecde33f --- /dev/null +++ b/infrastructure-provisioning/src/general/files/gcp/project_Dockerfile @@ -0,0 +1,35 @@ +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + + +FROM docker.dlab-base:latest + +ARG OS + +COPY project/ /root/ +COPY general/scripts/gcp/project_* /root/scripts/ +COPY general/scripts/gcp/edge_* /root/scripts/ +COPY general/lib/os/${OS}/edge_lib.py /usr/lib/python2.7/dlab/edge_lib.py +COPY general/files/gcp/ps_policy.json /root/files/ps_policy.json +COPY general/files/gcp/ps_roles.json /root/files/ps_roles.json + +RUN chmod a+x /root/fabfile.py; \ + chmod a+x /root/scripts/* \ No newline at end of file diff --git a/infrastructure-provisioning/src/general/files/gcp/project_description.json b/infrastructure-provisioning/src/general/files/gcp/project_description.json new file mode 100644 index 0000000000..fff7b0b67d --- /dev/null +++ b/infrastructure-provisioning/src/general/files/gcp/project_description.json @@ -0,0 +1,4 @@ +{ + "template_name": "Crete project environment.", + "description": "Create user subnet." +} \ No newline at end of file diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py index eb60871a14..dee972f12a 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py @@ -68,9 +68,9 @@ project_conf['project_name']) project_conf['ps_policy_path'] = '/root/files/ps_policy.json' project_conf['ps_roles_path'] = '/root/files/ps_roles.json' - project_conf['instance_name'] = '{0}-{1}-edge'.format(project_conf['service_base_name'], edge_conf['project_name']) - project_conf['ssn_instance_name'] = '{}-ssn'.format(edge_conf['service_base_name']) - project_conf['bucket_name'] = '{0}-{1}-bucket'.format(project_conf['service_base_name'], edge_conf['project_name']) + project_conf['instance_name'] = '{0}-{1}-edge'.format(project_conf['service_base_name'], project_conf['project_name']) + project_conf['ssn_instance_name'] = '{}-ssn'.format(project_conf['service_base_name']) + project_conf['bucket_name'] = '{0}-{1}-bucket'.format(project_conf['service_base_name'], project_conf['project_name']) project_conf['shared_bucket_name'] = '{}-shared-bucket'.format(project_conf['service_base_name']) project_conf['instance_size'] = os.environ['gcp_edge_instance_size'] project_conf['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) @@ -100,38 +100,38 @@ sys.exit(1) print("Will create exploratory environment with edge node as access point as following: ".format(json.dumps( - edge_conf, sort_keys=True, indent=4, separators=(',', ': ')))) - logging.info(json.dumps(edge_conf)) + project_conf, sort_keys=True, indent=4, separators=(',', ': ')))) + logging.info(json.dumps(project_conf)) try: logging.info('[CREATE SUBNET]') print('[CREATE SUBNET]') params = "--subnet_name {} --region {} --vpc_selflink {} --prefix {} --vpc_cidr {}" \ - .format(edge_conf['private_subnet_name'], edge_conf['region'], edge_conf['vpc_selflink'], - edge_conf['private_subnet_prefix'], edge_conf['vpc_cidr']) + .format(project_conf['private_subnet_name'], project_conf['region'], project_conf['vpc_selflink'], + project_conf['private_subnet_prefix'], project_conf['vpc_cidr']) try: local("~/scripts/{}.py {}".format('common_create_subnet', params)) - edge_conf['private_subnet_cidr'] = GCPMeta().get_subnet(edge_conf['private_subnet_name'], - edge_conf['region'])['ipCidrRange'] + project_conf['private_subnet_cidr'] = GCPMeta().get_subnet(project_conf['private_subnet_name'], + project_conf['region'])['ipCidrRange'] except: traceback.print_exc() raise Exception except Exception as err: print('Error: {0}'.format(err)) try: - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) except: print("Subnet hasn't been created.") append_result("Failed to create subnet.", str(err)) sys.exit(1) - print('NEW SUBNET CIDR CREATED: {}'.format(edge_conf['private_subnet_cidr'])) + print('NEW SUBNET CIDR CREATED: {}'.format(project_conf['private_subnet_cidr'])) try: logging.info('[CREATE SERVICE ACCOUNT AND ROLE FOR EDGE NODE]') print('[CREATE SERVICE ACCOUNT AND ROLE FOR EDGE NODE]') - params = "--service_account_name {} --role_name {}".format(edge_conf['edge_service_account_name'], - edge_conf['edge_role_name']) + params = "--service_account_name {} --role_name {}".format(project_conf['edge_service_account_name'], + project_conf['edge_role_name']) try: local("~/scripts/{}.py {}".format('common_create_service_account', params)) @@ -141,11 +141,11 @@ except Exception as err: print('Error: {0}'.format(err)) try: - GCPActions().remove_service_account(edge_conf['edge_service_account_name']) - GCPActions().remove_role(edge_conf['edge_role_name']) + GCPActions().remove_service_account(project_conf['edge_service_account_name']) + GCPActions().remove_role(project_conf['edge_role_name']) except: print("Service account or role hasn't been created") - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) append_result("Failed to creating service account and role.", str(err)) sys.exit(1) @@ -153,8 +153,8 @@ logging.info('[CREATE SERVICE ACCOUNT AND ROLE FOR PRIVATE SUBNET]') print('[CREATE SERVICE ACCOUNT AND ROLE FOR NOTEBOOK NODE]') params = "--service_account_name {} --role_name {} --policy_path {} --roles_path {}".format( - edge_conf['ps_service_account_name'], edge_conf['ps_role_name'], - edge_conf['ps_policy_path'], edge_conf['ps_roles_path']) + project_conf['ps_service_account_name'], project_conf['ps_role_name'], + project_conf['ps_policy_path'], project_conf['ps_roles_path']) try: local("~/scripts/{}.py {}".format('common_create_service_account', params)) @@ -164,13 +164,13 @@ except Exception as err: print('Error: {0}'.format(err)) try: - GCPActions().remove_service_account(edge_conf['ps_service_account_name']) - GCPActions().remove_role(edge_conf['ps_role_name']) + GCPActions().remove_service_account(project_conf['ps_service_account_name']) + GCPActions().remove_role(project_conf['ps_role_name']) except: print("Service account or role hasn't been created") - GCPActions().remove_service_account(edge_conf['edge_service_account_name']) - GCPActions().remove_role(edge_conf['edge_role_name']) - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_service_account(project_conf['edge_service_account_name']) + GCPActions().remove_role(project_conf['edge_role_name']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) append_result("Failed to creating service account and role.", str(err)) sys.exit(1) @@ -183,9 +183,9 @@ firewall_rules['egress'] = [] ingress_rule = dict() - ingress_rule['name'] = edge_conf['fw_edge_ingress_public'] - ingress_rule['targetTags'] = [edge_conf['network_tag']] - ingress_rule['sourceRanges'] = [edge_conf['allowed_ip_cidr']] + ingress_rule['name'] = project_conf['fw_edge_ingress_public'] + ingress_rule['targetTags'] = [project_conf['network_tag']] + ingress_rule['sourceRanges'] = [project_conf['allowed_ip_cidr']] rules = [ { 'IPProtocol': 'tcp', @@ -193,28 +193,28 @@ } ] ingress_rule['allowed'] = rules - ingress_rule['network'] = edge_conf['vpc_selflink'] + ingress_rule['network'] = project_conf['vpc_selflink'] ingress_rule['direction'] = 'INGRESS' firewall_rules['ingress'].append(ingress_rule) ingress_rule = dict() - ingress_rule['name'] = edge_conf['fw_edge_ingress_internal'] - ingress_rule['targetTags'] = [edge_conf['network_tag']] - ingress_rule['sourceRanges'] = [edge_conf['private_subnet_cidr']] + ingress_rule['name'] = project_conf['fw_edge_ingress_internal'] + ingress_rule['targetTags'] = [project_conf['network_tag']] + ingress_rule['sourceRanges'] = [project_conf['private_subnet_cidr']] rules = [ { 'IPProtocol': 'all' } ] ingress_rule['allowed'] = rules - ingress_rule['network'] = edge_conf['vpc_selflink'] + ingress_rule['network'] = project_conf['vpc_selflink'] ingress_rule['direction'] = 'INGRESS' firewall_rules['ingress'].append(ingress_rule) egress_rule = dict() - egress_rule['name'] = edge_conf['fw_edge_egress_public'] - egress_rule['targetTags'] = [edge_conf['network_tag']] - egress_rule['destinationRanges'] = [edge_conf['allowed_ip_cidr']] + egress_rule['name'] = project_conf['fw_edge_egress_public'] + egress_rule['targetTags'] = [project_conf['network_tag']] + egress_rule['destinationRanges'] = [project_conf['allowed_ip_cidr']] rules = [ { 'IPProtocol': 'udp', @@ -226,14 +226,14 @@ } ] egress_rule['allowed'] = rules - egress_rule['network'] = edge_conf['vpc_selflink'] + egress_rule['network'] = project_conf['vpc_selflink'] egress_rule['direction'] = 'EGRESS' firewall_rules['egress'].append(egress_rule) egress_rule = dict() - egress_rule['name'] = edge_conf['fw_edge_egress_internal'] - egress_rule['targetTags'] = [edge_conf['network_tag']] - egress_rule['destinationRanges'] = [edge_conf['private_subnet_cidr']] + egress_rule['name'] = project_conf['fw_edge_egress_internal'] + egress_rule['targetTags'] = [project_conf['network_tag']] + egress_rule['destinationRanges'] = [project_conf['private_subnet_cidr']] rules = [ { 'IPProtocol': 'tcp', @@ -242,7 +242,7 @@ } ] egress_rule['allowed'] = rules - egress_rule['network'] = edge_conf['vpc_selflink'] + egress_rule['network'] = project_conf['vpc_selflink'] egress_rule['direction'] = 'EGRESS' firewall_rules['egress'].append(egress_rule) @@ -254,12 +254,12 @@ raise Exception except Exception as err: print('Error: {0}'.format(err)) - GCPActions().remove_service_account(edge_conf['ps_service_account_name']) - GCPActions().remove_role(edge_conf['ps_role_name']) - GCPActions().remove_service_account(edge_conf['edge_service_account_name']) - GCPActions().remove_role(edge_conf['edge_role_name']) + GCPActions().remove_service_account(project_conf['ps_service_account_name']) + GCPActions().remove_role(project_conf['ps_role_name']) + GCPActions().remove_service_account(project_conf['edge_service_account_name']) + GCPActions().remove_role(project_conf['edge_role_name']) append_result("Failed to create firewall for Edge node.", str(err)) - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) sys.exit(1) try: @@ -270,13 +270,13 @@ firewall_rules['egress'] = [] ingress_rule = dict() - ingress_rule['name'] = edge_conf['fw_ps_ingress'] + ingress_rule['name'] = project_conf['fw_ps_ingress'] ingress_rule['targetTags'] = [ - edge_conf['ps_firewall_target'] + project_conf['ps_firewall_target'] ] - ingress_rule['sourceRanges'] = [edge_conf['private_subnet_cidr'], - GCPMeta().get_subnet(edge_conf['subnet_name'], - edge_conf['region'])['ipCidrRange'] + ingress_rule['sourceRanges'] = [project_conf['private_subnet_cidr'], + GCPMeta().get_subnet(project_conf['subnet_name'], + project_conf['region'])['ipCidrRange'] ] rules = [ { @@ -284,18 +284,18 @@ } ] ingress_rule['allowed'] = rules - ingress_rule['network'] = edge_conf['vpc_selflink'] + ingress_rule['network'] = project_conf['vpc_selflink'] ingress_rule['direction'] = 'INGRESS' firewall_rules['ingress'].append(ingress_rule) egress_rule = dict() - egress_rule['name'] = edge_conf['fw_ps_egress_private'] + egress_rule['name'] = project_conf['fw_ps_egress_private'] egress_rule['targetTags'] = [ - edge_conf['ps_firewall_target'] + project_conf['ps_firewall_target'] ] - egress_rule['destinationRanges'] = [edge_conf['private_subnet_cidr'], - GCPMeta().get_subnet(edge_conf['subnet_name'], - edge_conf['region'])['ipCidrRange'] + egress_rule['destinationRanges'] = [project_conf['private_subnet_cidr'], + GCPMeta().get_subnet(project_conf['subnet_name'], + project_conf['region'])['ipCidrRange'] ] rules = [ { @@ -303,16 +303,16 @@ } ] egress_rule['allowed'] = rules - egress_rule['network'] = edge_conf['vpc_selflink'] + egress_rule['network'] = project_conf['vpc_selflink'] egress_rule['direction'] = 'EGRESS' firewall_rules['egress'].append(egress_rule) egress_rule = dict() - egress_rule['name'] = edge_conf['fw_ps_egress_public'] + egress_rule['name'] = project_conf['fw_ps_egress_public'] egress_rule['targetTags'] = [ - edge_conf['ps_firewall_target'] + project_conf['ps_firewall_target'] ] - egress_rule['destinationRanges'] = [edge_conf['allowed_ip_cidr']] + egress_rule['destinationRanges'] = [project_conf['allowed_ip_cidr']] rules = [ { 'IPProtocol': 'tcp', @@ -320,7 +320,7 @@ } ] egress_rule['allowed'] = rules - egress_rule['network'] = edge_conf['vpc_selflink'] + egress_rule['network'] = project_conf['vpc_selflink'] egress_rule['direction'] = 'EGRESS' firewall_rules['egress'].append(egress_rule) @@ -333,21 +333,21 @@ except Exception as err: print('Error: {0}'.format(err)) append_result("Failed to create firewall for private subnet.", str(err)) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) - GCPActions().remove_service_account(edge_conf['ps_service_account_name']) - GCPActions().remove_role(edge_conf['ps_role_name']) - GCPActions().remove_service_account(edge_conf['edge_service_account_name']) - GCPActions().remove_role(edge_conf['edge_role_name']) - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_internal']) + GCPActions().remove_service_account(project_conf['ps_service_account_name']) + GCPActions().remove_role(project_conf['ps_role_name']) + GCPActions().remove_service_account(project_conf['edge_service_account_name']) + GCPActions().remove_role(project_conf['edge_role_name']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) sys.exit(1) try: logging.info('[CREATE BUCKETS]') print('[CREATE BUCKETS]') - params = "--bucket_name {}".format(edge_conf['bucket_name']) + params = "--bucket_name {}".format(project_conf['bucket_name']) try: local("~/scripts/{}.py {}".format('common_create_bucket', params)) @@ -357,47 +357,47 @@ except Exception as err: print('Error: {0}'.format(err)) append_result("Unable to create bucket.", str(err)) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) - GCPActions().remove_firewall(edge_conf['fw_ps_ingress']) - GCPActions().remove_firewall(edge_conf['fw_ps_egress_private']) - GCPActions().remove_firewall(edge_conf['fw_ps_egress_public']) - GCPActions().remove_service_account(edge_conf['ps_service_account_name']) - GCPActions().remove_role(edge_conf['ps_role_name']) - GCPActions().remove_service_account(edge_conf['edge_service_account_name']) - GCPActions().remove_role(edge_conf['edge_role_name']) - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_internal']) + GCPActions().remove_firewall(project_conf['fw_ps_ingress']) + GCPActions().remove_firewall(project_conf['fw_ps_egress_private']) + GCPActions().remove_firewall(project_conf['fw_ps_egress_public']) + GCPActions().remove_service_account(project_conf['ps_service_account_name']) + GCPActions().remove_role(project_conf['ps_role_name']) + GCPActions().remove_service_account(project_conf['edge_service_account_name']) + GCPActions().remove_role(project_conf['edge_role_name']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) sys.exit(1) try: logging.info('[SET PERMISSIONS FOR USER AND SHARED BUCKETS]') print('[SET PERMISSIONS FOR USER AND SHARED BUCKETS]') - GCPActions().set_bucket_owner(edge_conf['bucket_name'], edge_conf['ps_service_account_name']) - GCPActions().set_bucket_owner(edge_conf['shared_bucket_name'], edge_conf['ps_service_account_name']) + GCPActions().set_bucket_owner(project_conf['bucket_name'], project_conf['ps_service_account_name']) + GCPActions().set_bucket_owner(project_conf['shared_bucket_name'], project_conf['ps_service_account_name']) except Exception as err: print('Error: {0}'.format(err)) append_result("Failed to set bucket permissions.", str(err)) - GCPActions().remove_bucket(edge_conf['bucket_name']) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) - GCPActions().remove_firewall(edge_conf['fw_ps_ingress']) - GCPActions().remove_firewall(edge_conf['fw_ps_egress_private']) - GCPActions().remove_firewall(edge_conf['fw_ps_egress_public']) - GCPActions().remove_service_account(edge_conf['ps_service_account_name']) - GCPActions().remove_role(edge_conf['ps_role_name']) - GCPActions().remove_service_account(edge_conf['edge_service_account_name']) - GCPActions().remove_role(edge_conf['edge_role_name']) - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_bucket(project_conf['bucket_name']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_internal']) + GCPActions().remove_firewall(project_conf['fw_ps_ingress']) + GCPActions().remove_firewall(project_conf['fw_ps_egress_private']) + GCPActions().remove_firewall(project_conf['fw_ps_egress_public']) + GCPActions().remove_service_account(project_conf['ps_service_account_name']) + GCPActions().remove_role(project_conf['ps_role_name']) + GCPActions().remove_service_account(project_conf['edge_service_account_name']) + GCPActions().remove_role(project_conf['edge_role_name']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) sys.exit(1) try: logging.info('[CREATING STATIC IP ADDRESS]') print('[CREATING STATIC IP ADDRESS]') - params = "--address_name {} --region {}".format(edge_conf['static_address_name'], edge_conf['region']) + params = "--address_name {} --region {}".format(project_conf['static_address_name'], project_conf['region']) try: local("~/scripts/{}.py {}".format('edge_create_static_ip', params)) except: @@ -407,22 +407,22 @@ print('Error: {0}'.format(err)) append_result("Failed to create static ip.", str(err)) try: - GCPActions().remove_static_address(edge_conf['static_address_name'], edge_conf['region']) + GCPActions().remove_static_address(project_conf['static_address_name'], project_conf['region']) except: print("Static IP address hasn't been created.") - GCPActions().remove_bucket(edge_conf['bucket_name']) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) - GCPActions().remove_firewall(edge_conf['fw_ps_ingress']) - GCPActions().remove_firewall(edge_conf['fw_ps_egress_private']) - GCPActions().remove_firewall(edge_conf['fw_ps_egress_public']) - GCPActions().remove_service_account(edge_conf['ps_service_account_name']) - GCPActions().remove_role(edge_conf['ps_role_name']) - GCPActions().remove_service_account(edge_conf['edge_service_account_name']) - GCPActions().remove_role(edge_conf['edge_role_name']) - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_bucket(project_conf['bucket_name']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_internal']) + GCPActions().remove_firewall(project_conf['fw_ps_ingress']) + GCPActions().remove_firewall(project_conf['fw_ps_egress_private']) + GCPActions().remove_firewall(project_conf['fw_ps_egress_public']) + GCPActions().remove_service_account(project_conf['ps_service_account_name']) + GCPActions().remove_role(project_conf['ps_role_name']) + GCPActions().remove_service_account(project_conf['edge_service_account_name']) + GCPActions().remove_role(project_conf['edge_role_name']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) sys.exit(1) if os.environ['conf_os_family'] == 'debian': @@ -433,15 +433,15 @@ sudo_group = 'wheel' try: - edge_conf['static_ip'] = \ - GCPMeta().get_static_address(edge_conf['region'], edge_conf['static_address_name'])['address'] + project_conf['static_ip'] = \ + GCPMeta().get_static_address(project_conf['region'], project_conf['static_address_name'])['address'] logging.info('[CREATE EDGE INSTANCE]') print('[CREATE EDGE INSTANCE]') params = "--instance_name {} --region {} --zone {} --vpc_name {} --subnet_name {} --instance_size {} --ssh_key_path {} --initial_user {} --service_account_name {} --image_name {} --instance_class {} --static_ip {} --network_tag {} --labels '{}'".\ - format(edge_conf['instance_name'], edge_conf['region'], edge_conf['zone'], edge_conf['vpc_name'], - edge_conf['subnet_name'], edge_conf['instance_size'], edge_conf['ssh_key_path'], initial_user, - edge_conf['edge_service_account_name'], edge_conf['image_name'], 'edge', edge_conf['static_ip'], - edge_conf['network_tag'], json.dumps(edge_conf['instance_labels'])) + format(project_conf['instance_name'], project_conf['region'], project_conf['zone'], project_conf['vpc_name'], + project_conf['subnet_name'], project_conf['instance_size'], project_conf['ssh_key_path'], initial_user, + project_conf['edge_service_account_name'], project_conf['image_name'], 'edge', project_conf['static_ip'], + project_conf['network_tag'], json.dumps(project_conf['instance_labels'])) try: local("~/scripts/{}.py {}".format('common_create_instance', params)) except: @@ -450,18 +450,18 @@ except Exception as err: print('Error: {0}'.format(err)) append_result("Failed to create instance.", str(err)) - GCPActions().remove_static_address(edge_conf['static_address_name'], edge_conf['region']) - GCPActions().remove_bucket(edge_conf['bucket_name']) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_ingress_internal']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_public']) - GCPActions().remove_firewall(edge_conf['fw_edge_egress_internal']) - GCPActions().remove_firewall(edge_conf['fw_ps_ingress']) - GCPActions().remove_firewall(edge_conf['fw_ps_egress_private']) - GCPActions().remove_firewall(edge_conf['fw_ps_egress_public']) - GCPActions().remove_service_account(edge_conf['ps_service_account_name']) - GCPActions().remove_role(edge_conf['ps_role_name']) - GCPActions().remove_service_account(edge_conf['edge_service_account_name']) - GCPActions().remove_role(edge_conf['edge_role_name']) - GCPActions().remove_subnet(edge_conf['private_subnet_name'], edge_conf['region']) + GCPActions().remove_static_address(project_conf['static_address_name'], project_conf['region']) + GCPActions().remove_bucket(project_conf['bucket_name']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_ingress_internal']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_public']) + GCPActions().remove_firewall(project_conf['fw_edge_egress_internal']) + GCPActions().remove_firewall(project_conf['fw_ps_ingress']) + GCPActions().remove_firewall(project_conf['fw_ps_egress_private']) + GCPActions().remove_firewall(project_conf['fw_ps_egress_public']) + GCPActions().remove_service_account(project_conf['ps_service_account_name']) + GCPActions().remove_role(project_conf['ps_role_name']) + GCPActions().remove_service_account(project_conf['edge_service_account_name']) + GCPActions().remove_role(project_conf['edge_role_name']) + GCPActions().remove_subnet(project_conf['private_subnet_name'], project_conf['region']) sys.exit(1) \ No newline at end of file From a1393e3526b19a589caf14ab74da2a12ae0f0bfb Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 5 Jul 2019 15:29:17 +0300 Subject: [PATCH 283/357] [DLAB-834]: added new status states; filter pipe added --- .../webapp/src/app/administration/project/index.ts | 4 +++- .../project/project-list/project-list.component.html | 2 +- .../src/main/resources/webapp/src/styles.scss | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts index 1c086d01bf..f03b47ebd7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts @@ -23,6 +23,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../shared/material.module'; import { FormControlsModule } from '../../shared/form-controls'; +import { UnderscorelessPipeModule } from '../../core/pipes/underscoreless-pipe'; import { ProjectFormComponent } from './project-form/project-form.component'; import { ProjectListComponent } from './project-list/project-list.component'; @@ -36,7 +37,8 @@ import { ProjectDataService } from './project-data.service'; FormsModule, ReactiveFormsModule, MaterialModule, - FormControlsModule + FormControlsModule, + UnderscorelessPipeModule ], declarations: [ProjectComponent, EditProjectComponent, ProjectFormComponent, ProjectListComponent], entryComponents: [EditProjectComponent], diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 716ea886d8..449d0f8c06 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -35,7 +35,7 @@ Status - {{ element.status.toLowerCase() }} + {{ element.status.toLowerCase() | underscoreless }} diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 5b72b0fb9e..923e384508 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -105,12 +105,15 @@ mat-chip.mat-chip strong { .running, .starting, .installed, -.active { +.active, +.activating { color: #49af38; } .stopped, -.stopping { +.stopping, +.deactivating, +.not_active { color: #f7b500; } @@ -125,7 +128,9 @@ mat-chip.mat-chip strong { .terminated, .terminating, -.failed { +.failed, +.deleting, +.deleted { color: #f1696e; } From fecb213cb39d99cfba3ad5f8d177d4030e568d96 Mon Sep 17 00:00:00 2001 From: bhliva Date: Fri, 5 Jul 2019 16:22:15 +0300 Subject: [PATCH 284/357] DLAB-837 added project_name param to status command --- .../com/epam/dlab/dto/status/EnvResource.java | 5 ++- .../mock_response/gcp/notebook_create.json | 1 + .../com/epam/dlab/backendapi/dao/EnvDAO.java | 39 +++++++------------ .../dlab/backendapi/util/RequestBuilder.java | 1 + 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/status/EnvResource.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/status/EnvResource.java index 84e33f92e4..3f5aef2f9d 100644 --- a/services/dlab-model/src/main/java/com/epam/dlab/dto/status/EnvResource.java +++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/status/EnvResource.java @@ -42,14 +42,17 @@ public class EnvResource { private String name; @JsonProperty private ResourceType resourceType; + @JsonProperty("project_name") + private String project; @JsonDeserialize(using = IsoLocalDateTimeDeSerializer.class) @JsonProperty private LocalDateTime lastActivity; - public EnvResource(String id, String name, ResourceType resourceType) { + public EnvResource(String id, String name, ResourceType resourceType, String project) { this.id = id; this.name = name; this.resourceType = resourceType; + this.project = project; } /** diff --git a/services/provisioning-service/src/main/resources/mock_response/gcp/notebook_create.json b/services/provisioning-service/src/main/resources/mock_response/gcp/notebook_create.json index 4de53d092a..7d7bad5c6e 100644 --- a/services/provisioning-service/src/main/resources/mock_response/gcp/notebook_create.json +++ b/services/provisioning-service/src/main/resources/mock_response/gcp/notebook_create.json @@ -14,6 +14,7 @@ "description": "Ungit" } ], + "instance_id": "${INSTANCE_ID}", "notebook_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-${EXPLORATORY_NAME}-${NOTEBOOK_ID}", "Action": "Create new notebook server", "master_keyname": "${CONF_KEY_NAME}" diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EnvDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EnvDAO.java index 2fb7b9a99d..b2c6c2b10c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EnvDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EnvDAO.java @@ -69,9 +69,10 @@ public class EnvDAO extends BaseDAO { private static final String COMPUTATIONAL_STATUS_FILTER = COMPUTATIONAL_RESOURCES + FIELD_SET_DELIMETER + STATUS; private static final String COMPUTATIONAL_SPOT = "slave_node_spot"; private static final String IMAGE = "image"; + private static final String PROJECT = "project"; private static final Bson INCLUDE_EDGE_FIELDS = include(INSTANCE_ID, EDGE_STATUS, EDGE_PUBLIC_IP); - private static final Bson INCLUDE_EXP_FIELDS = include(INSTANCE_ID, STATUS, + private static final Bson INCLUDE_EXP_FIELDS = include(INSTANCE_ID, STATUS, PROJECT, COMPUTATIONAL_RESOURCES + "." + INSTANCE_ID, COMPUTATIONAL_RESOURCES + "." + IMAGE, COMPUTATIONAL_STATUS, EXPLORATORY_NAME, COMPUTATIONAL_RESOURCES + "." + ComputationalDAO.COMPUTATIONAL_NAME); private static final Bson INCLUDE_EXP_UPDATE_FIELDS = include(EXPLORATORY_NAME, INSTANCE_ID, STATUS, @@ -92,12 +93,13 @@ public EnvResourceList findEnvResources(String user) { List hostList = new ArrayList<>(); List clusterList = new ArrayList<>(); - getEdgeNode(user).ifPresent(edge -> addResource(hostList, edge, EDGE_STATUS, ResourceType.EDGE, null)); + //getEdgeNode(user).ifPresent(edge -> addResource(hostList, edge, EDGE_STATUS, ResourceType.EDGE, null)); stream(find(USER_INSTANCES, eq(USER, user), fields(INCLUDE_EXP_FIELDS, excludeId()))) .forEach(exp -> { final String exploratoryName = exp.getString(EXPLORATORY_NAME); - addResource(hostList, exp, STATUS, ResourceType.EXPLORATORY, exploratoryName); + final String project = exp.getString(PROJECT); + addResource(hostList, exp, STATUS, ResourceType.EXPLORATORY, exploratoryName, project); addComputationalResources(hostList, clusterList, exp, exploratoryName); }); return new EnvResourceList() @@ -113,31 +115,16 @@ public List findRunningResourcesForCheckInactivity() { .collect(Collectors.toList()); } - private List getRunningEnvResources(Document ui) { - final String exploratoryName = ui.getString(EXPLORATORY_NAME); - final List envResources = getComputationalResources(ui) - .stream() - .filter(comp -> RUNNING.toString().equals(comp.getString(STATUS))) - .map(comp -> toEnvResource(String.join("_", exploratoryName, - comp.getString(COMPUTATIONAL_NAME)), comp.getString(INSTANCE_ID), - ResourceType.COMPUTATIONAL)) - .collect(Collectors.toList()); - if (UserInstanceStatus.of(ui.getString(STATUS)) == RUNNING) { - envResources.add(toEnvResource(exploratoryName, ui.getString(INSTANCE_ID), - ResourceType.EXPLORATORY)); - } - return envResources; - } - - private EnvResource toEnvResource(String name, String instanceId, ResourceType resType) { - return new EnvResource(instanceId, name, resType); + private EnvResource toEnvResource(String name, String instanceId, ResourceType resType, String project) { + return new EnvResource(instanceId, name, resType, project); } @SuppressWarnings("unchecked") private void addComputationalResources(List hostList, List clusterList, Document exp, String exploratoryName) { + final String project = exp.getString(PROJECT); getComputationalResources(exp) - .forEach(comp -> addComputational(hostList, clusterList, exploratoryName, comp)); + .forEach(comp -> addComputational(hostList, clusterList, exploratoryName, comp, project)); } private List getComputationalResources(Document userInstanceDocument) { @@ -145,12 +132,12 @@ private List getComputationalResources(Document userInstanceDocument) } private void addComputational(List hostList, List clusterList, String exploratoryName, - Document computational) { + Document computational, String project) { final List resourceList = DataEngineType.CLOUD_SERVICE == DataEngineType.fromDockerImageName(computational.getString(IMAGE)) ? clusterList : hostList; addResource(resourceList, computational, STATUS, ResourceType.COMPUTATIONAL, - String.join("_", exploratoryName, computational.getString(COMPUTATIONAL_NAME))); + String.join("_", exploratoryName, computational.getString(COMPUTATIONAL_NAME)), project); } /** @@ -522,13 +509,13 @@ private boolean terminateComputationalSpot(String user, String exploratoryName, * @param resourceType type if resource EDGE/NOTEBOOK */ private void addResource(List list, Document document, String statusFieldName, - ResourceType resourceType, String name) { + ResourceType resourceType, String name, String project) { LOGGER.trace("Add resource from {}", document); getInstanceId(document).ifPresent(instanceId -> Optional.ofNullable(UserInstanceStatus.of(document.getString(statusFieldName))) .filter(s -> s.in(CONFIGURING, CREATING, RUNNING, STARTING, STOPPED, STOPPING, TERMINATING) || (FAILED == s && ResourceType.EDGE == resourceType)) - .ifPresent(s -> list.add(toEnvResource(name, instanceId, resourceType)))); + .ifPresent(s -> list.add(toEnvResource(name, instanceId, resourceType, project)))); } private boolean notEmpty(List hostList) { diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java index 76941602d1..cd88930755 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java @@ -532,6 +532,7 @@ public T newExploratoryImageCreate(UserInfo user String imageName) { checkInappropriateCloudProviderOrElseThrowException(); return (T) newResourceSysBaseDTO(userInfo, ExploratoryImageDTO.class) + .withProject(userInstance.getProject()) .withNotebookInstanceName(userInstance.getExploratoryId()) .withExploratoryName(userInstance.getExploratoryName()) .withApplicationName(getApplicationNameFromImage(userInstance.getImageName())) From 62c5f7a9c0b99bb3f49a5787a8cb272d2a698e42 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Fri, 5 Jul 2019 17:21:24 +0300 Subject: [PATCH 285/357] gcp project creation added --- ...n_notebook_configure_dataengine-service.py | 7 +++-- .../common_notebook_configure_dataengine.py | 5 ++-- .../src/general/scripts/gcp/edge_configure.py | 29 ++++++++++--------- .../scripts/gcp/edge_create_static_ip.py | 2 +- .../src/general/scripts/gcp/edge_start.py | 8 ++--- .../src/general/scripts/gcp/edge_status.py | 2 +- .../src/general/scripts/gcp/edge_stop.py | 6 ++-- .../general/scripts/gcp/jupyter_configure.py | 12 ++++---- .../general/scripts/gcp/rstudio_configure.py | 9 +++--- .../scripts/gcp/tensor-rstudio_configure.py | 11 +++---- .../general/scripts/gcp/tensor_configure.py | 9 +++--- .../general/scripts/gcp/zeppelin_configure.py | 9 +++--- 12 files changed, 59 insertions(+), 50 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py index da88b5e957..3f99a51857 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py @@ -32,7 +32,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -45,12 +45,13 @@ notebook_config['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') notebook_config['notebook_name'] = os.environ['notebook_instance_name'] notebook_config['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + notebook_config['project_name'] = (os.environ['project_name']).lower().replace('_', '-') notebook_config['tag_name'] = notebook_config['service_base_name'] + '-Tag' - notebook_config['bucket_name'] = '{}-{}-bucket'.format(notebook_config['service_base_name'], notebook_config['edge_user_name']) + notebook_config['bucket_name'] = '{}-{}-bucket'.format(notebook_config['service_base_name'], notebook_config['project_name']) notebook_config['cluster_name'] = meta_lib.GCPMeta().get_not_configured_dataproc(notebook_config['notebook_name']) notebook_config['notebook_ip'] = meta_lib.GCPMeta().get_private_ip_address(notebook_config['notebook_name']) notebook_config['key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) - edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['edge_user_name']) + edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name']) edge_instance_hostname = meta_lib.GCPMeta().get_private_ip_address(edge_instance_name) if os.environ['application'] == 'deeplearning': application = 'jupyter' diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py index acb80e8018..d3b846c291 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py @@ -32,7 +32,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -55,7 +55,8 @@ notebook_config['region'] = os.environ['gcp_region'] notebook_config['zone'] = os.environ['gcp_zone'] notebook_config['user_name'] = os.environ['edge_user_name'].replace('_', '-') - notebook_config['cluster_name'] = notebook_config['service_base_name'] + '-' + notebook_config['user_name'] + \ + notebook_config['project_name'] = os.environ['project_name'].replace('_', '-') + notebook_config['cluster_name'] = notebook_config['service_base_name'] + '-' + notebook_config['project_name'] + \ '-de-' + notebook_config['exploratory_name'] + '-' + \ notebook_config['computational_name'] notebook_config['master_node_name'] = notebook_config['cluster_name'] + '-m' diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py index 8f6521d9dd..63a1cdd0c7 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py @@ -28,7 +28,7 @@ from dlab.actions_lib import * if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/edge/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -39,8 +39,8 @@ edge_conf = dict() edge_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') edge_conf['key_name'] = os.environ['conf_key_name'] - edge_conf['user_keyname'] = os.environ['edge_user_name'] - edge_conf['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + edge_conf['user_keyname'] = os.environ['project_name'] + edge_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-') try: if os.environ['gcp_vpc_name'] == '': raise KeyError @@ -49,28 +49,28 @@ except KeyError: edge_conf['vpc_name'] = edge_conf['service_base_name'] + '-ssn-vpc' edge_conf['vpc_cidr'] = os.environ['conf_vpc_cidr'] - edge_conf['subnet_name'] = '{0}-{1}-subnet'.format(edge_conf['service_base_name'], edge_conf['edge_user_name']) + edge_conf['subnet_name'] = '{0}-{1}-subnet'.format(edge_conf['service_base_name'], edge_conf['project_name']) edge_conf['region'] = os.environ['gcp_region'] edge_conf['zone'] = os.environ['gcp_zone'] edge_conf['vpc_selflink'] = GCPMeta().get_vpc(edge_conf['vpc_name'])['selfLink'] edge_conf['private_subnet_prefix'] = os.environ['gcp_private_subnet_prefix'] edge_conf['edge_service_account_name'] = '{}-{}-edge'.format(edge_conf['service_base_name'], - edge_conf['edge_user_name']) + edge_conf['project_name']) edge_conf['edge_role_name'] = '{}-{}-edge'.format(edge_conf['service_base_name'], - edge_conf['edge_user_name']) + edge_conf['project_name']) edge_conf['ps_service_account_name'] = '{}-{}-ps'.format(edge_conf['service_base_name'], - edge_conf['edge_user_name']) + edge_conf['project_name']) edge_conf['ps_role_name'] = '{}-{}-ps'.format(edge_conf['service_base_name'], - edge_conf['edge_user_name']) - edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf['edge_user_name']) + edge_conf['project_name']) + edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf[project_name']) edge_conf['firewall_name'] = edge_conf['instance_name'] + '{}-firewall'.format(edge_conf['instance_name']) edge_conf['notebook_firewall_name'] = '{0}-{1}-nb-firewall'.format(edge_conf['service_base_name'], - edge_conf['edge_user_name']) - edge_conf['bucket_name'] = '{0}-{1}-bucket'.format(edge_conf['service_base_name'], edge_conf['edge_user_name']) + edge_conf['project_name']) + edge_conf['bucket_name'] = '{0}-{1}-bucket'.format(edge_conf['service_base_name'], edge_conf['project_name']) edge_conf['shared_bucket_name'] = '{}-shared-bucket'.format(edge_conf['service_base_name']) edge_conf['instance_size'] = os.environ['gcp_edge_instance_size'] edge_conf['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) - edge_conf['static_address_name'] = '{0}-{1}-ip'.format(edge_conf['service_base_name'], edge_conf['edge_user_name']) + edge_conf['static_address_name'] = '{0}-{1}-ip'.format(edge_conf['service_base_name'], edge_conf['project_name']) instance_hostname = GCPMeta().get_instance_public_ip_by_name(edge_conf['instance_name']) edge_conf['dlab_ssh_user'] = os.environ['conf_os_user'] edge_conf['private_subnet_cidr'] = GCPMeta().get_subnet(edge_conf['subnet_name'], @@ -79,7 +79,7 @@ GCPMeta().get_static_address(edge_conf['region'], edge_conf['static_address_name'])['address'] edge_conf['private_ip'] = GCPMeta().get_private_ip_address(edge_conf['instance_name']) edge_conf['vpc_cidrs'] = [edge_conf['vpc_cidr']] - edge_conf['fw_common_name'] = '{}-{}-ps'.format(edge_conf['service_base_name'], edge_conf['edge_user_name']) + edge_conf['fw_common_name'] = '{}-{}-ps'.format(edge_conf['service_base_name'], edge_conf['project_name']) edge_conf['fw_ps_ingress'] = '{}-ingress'.format(edge_conf['fw_common_name']) edge_conf['fw_ps_egress_private'] = '{}-egress-private'.format(edge_conf['fw_common_name']) edge_conf['fw_ps_egress_public'] = '{}-egress-public'.format(edge_conf['fw_common_name']) @@ -165,7 +165,7 @@ logging.info('[INSTALLING HTTP PROXY]') additional_config = {"exploratory_subnet": edge_conf['private_subnet_cidr'], "template_file": "/root/templates/squid.conf", - "edge_user_name": os.environ['gcp_iam_user'], + "project_name": os.environ['project_name'], "ldap_host": os.environ['ldap_hostname'], "ldap_dn": os.environ['ldap_dn'], "ldap_user": os.environ['ldap_service_username'], @@ -285,6 +285,7 @@ "socks_port": "1080", "notebook_subnet": edge_conf['private_subnet_cidr'], "full_edge_conf": edge_conf, + "project_name": os.environ['project_name'], "Action": "Create new EDGE server"} print(json.dumps(res)) result.write(json.dumps(res)) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_create_static_ip.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_create_static_ip.py index 81df6be49a..8d648d2fc1 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_create_static_ip.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_create_static_ip.py @@ -34,7 +34,7 @@ args = parser.parse_args() if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py index 98c5eb4f0b..a40dc428ce 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py @@ -27,7 +27,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -38,11 +38,11 @@ print('Generating infrastructure names and tags') edge_conf = dict() edge_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') - edge_conf['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') - edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf['edge_user_name']) + edge_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-') + edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf['project_name']) edge_conf['region'] = os.environ['gcp_region'] edge_conf['zone'] = os.environ['gcp_zone'] - edge_conf['static_address_name'] = '{0}-{1}-ip'.format(edge_conf['service_base_name'], edge_conf['edge_user_name']) + edge_conf['static_address_name'] = '{0}-{1}-ip'.format(edge_conf['service_base_name'], edge_conf['project_name']) logging.info('[START EDGE]') print('[START EDGE]') diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_status.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_status.py index 4eb0cc948e..cf0e1f83bc 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_status.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_status.py @@ -30,7 +30,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/edge/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py index 4d8fc05da0..36ae2d0d5b 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py @@ -27,7 +27,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -38,8 +38,8 @@ edge_conf = dict() edge_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') edge_conf['zone'] = os.environ['gcp_zone'] - edge_conf['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') - edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf['edge_user_name']) + edge_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-') + edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf['project_name']) logging.info('[STOP EDGE]') print('[STOP EDGE]') diff --git a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py index ad4f8f11d5..73d87fcc58 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py @@ -31,7 +31,7 @@ if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -47,15 +47,17 @@ notebook_config['instance_type'] = os.environ['gcp_notebook_instance_size'] notebook_config['key_name'] = os.environ['conf_key_name'] notebook_config['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + notebook_config['project_name'] = (os.environ['project_name']).lower().replace('_', '-') + notebook_config['project_tag'] = os.environ['project_tag'] notebook_config['instance_name'] = '{0}-{1}-nb-{2}'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name'], + notebook_config['project_name'], notebook_config['exploratory_name']) notebook_config['expected_primary_image_name'] = '{}-{}-notebook-primary-image'.format( notebook_config['service_base_name'], os.environ['application']) notebook_config['expected_secondary_image_name'] = '{}-{}-notebook-secondary-image'.format( notebook_config['service_base_name'], os.environ['application']) instance_hostname = GCPMeta().get_private_ip_address(notebook_config['instance_name']) - edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['edge_user_name']) + edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name']) edge_instance_hostname = GCPMeta().get_instance_public_ip_by_name(edge_instance_name) edge_instance_private_ip = GCPMeta().get_private_ip_address(edge_instance_name) notebook_config['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) @@ -152,7 +154,7 @@ try: print('[INSTALLING USERs KEY]') logging.info('[INSTALLING USERs KEY]') - additional_config = {"user_keyname": os.environ['edge_user_name'], + additional_config = {"user_keyname": os.environ['project_name'], "user_keydir": os.environ['conf_key_dir']} params = "--hostname {} --keyfile {} --additional_config '{}' --user {}".format( instance_hostname, notebook_config['ssh_key_path'], json.dumps(additional_config), notebook_config['dlab_ssh_user']) @@ -250,7 +252,7 @@ print("Private IP: {}".format(ip_address)) print("Instance type: {}".format(notebook_config['instance_type'])) print("Key name: {}".format(notebook_config['key_name'])) - print("User key name: {}".format(os.environ['edge_user_name'])) + print("User key name: {}".format(os.environ['project_name'])) print("Jupyter URL: {}".format(jupyter_ip_url)) print("Ungit URL: {}".format(ungit_ip_url)) print("ReverseProxyNotebook".format(jupyter_notebook_acces_url)) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py index 8d9da73202..276f37acee 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py @@ -48,8 +48,9 @@ notebook_config['instance_type'] = os.environ['gcp_notebook_instance_size'] notebook_config['key_name'] = os.environ['conf_key_name'] notebook_config['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + notebook_config['project_name'] = (os.environ['project_name']).lower().replace('_', '-') notebook_config['instance_name'] = '{0}-{1}-nb-{2}'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name'], + notebook_config['project_name'], notebook_config['exploratory_name']) notebook_config['expected_primary_image_name'] = '{}-{}-notebook-primary-image'.format( notebook_config['service_base_name'], os.environ['application']) @@ -57,7 +58,7 @@ notebook_config['service_base_name'], os.environ['application']) # generating variables regarding EDGE proxy on Notebook instance instance_hostname = GCPMeta().get_private_ip_address(notebook_config['instance_name']) - edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['edge_user_name']) + edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name']) edge_instance_hostname = GCPMeta().get_instance_public_ip_by_name(edge_instance_name) edge_instance_private_ip = GCPMeta().get_private_ip_address(edge_instance_name) notebook_config['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) @@ -156,7 +157,7 @@ try: print('[INSTALLING USERs KEY]') logging.info('[INSTALLING USERs KEY]') - additional_config = {"user_keyname": os.environ['edge_user_name'], + additional_config = {"user_keyname": os.environ['project_name'], "user_keydir": os.environ['conf_key_dir']} params = "--hostname {} --keyfile {} --additional_config '{}' --user {}".format( instance_hostname, notebook_config['ssh_key_path'], json.dumps(additional_config), notebook_config['dlab_ssh_user']) @@ -255,7 +256,7 @@ print("Private IP: {}".format(ip_address)) print("Instance type: {}".format(notebook_config['instance_type'])) print("Key name: {}".format(notebook_config['key_name'])) - print("User key name: {}".format(os.environ['edge_user_name'])) + print("User key name: {}".format(os.environ['project_name'])) print("Rstudio URL: {}".format(rstudio_ip_url)) print("Rstudio user: {}".format(notebook_config['dlab_ssh_user'])) print("Rstudio pass: {}".format(notebook_config['rstudio_pass'])) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py index 0955584eb1..e49450ae10 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py @@ -37,7 +37,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -53,8 +53,9 @@ notebook_config['instance_type'] = os.environ['gcp_notebook_instance_size'] notebook_config['key_name'] = os.environ['conf_key_name'] notebook_config['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + notebook_config['project_name'] = (os.environ['project_name']).lower().replace('_', '-') notebook_config['instance_name'] = '{0}-{1}-nb-{2}'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name'], + notebook_config['project_name'], notebook_config['exploratory_name']) notebook_config['expected_primary_image_name'] = '{}-{}-notebook-primary-image'.format( notebook_config['service_base_name'], os.environ['application']) @@ -63,7 +64,7 @@ # generating variables regarding EDGE proxy on Notebook instance instance_hostname = GCPMeta().get_private_ip_address(notebook_config['instance_name']) - edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['edge_user_name']) + edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name']) edge_instance_hostname = GCPMeta().get_instance_public_ip_by_name(edge_instance_name) edge_instance_private_ip = GCPMeta().get_private_ip_address(edge_instance_name) notebook_config['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) @@ -159,7 +160,7 @@ try: print('[INSTALLING USERs KEY]') logging.info('[INSTALLING USERs KEY]') - additional_config = {"user_keyname": os.environ['edge_user_name'], + additional_config = {"user_keyname": os.environ['project_name'], "user_keydir": os.environ['conf_key_dir']} params = "--hostname {} --keyfile {} --additional_config '{}' --user {}".format( instance_hostname, notebook_config['ssh_key_path'], json.dumps(additional_config), notebook_config['dlab_ssh_user']) @@ -260,7 +261,7 @@ print("Private IP: {}".format(ip_address)) print("Instance type: {}".format(notebook_config['instance_type'])) print("Key name: {}".format(notebook_config['key_name'])) - print("User key name: {}".format(os.environ['edge_user_name'])) + print("User key name: {}".format(os.environ['project_name'])) print("TensorBoard URL: {}".format(tensorboard_url)) print("TensorBoard log dir: /var/log/tensorboard") print("Rstudio URL: {}".format(rstudio_ip_url)) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py index c646f142de..d10020de6d 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py @@ -33,7 +33,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -49,8 +49,9 @@ notebook_config['instance_type'] = os.environ['gcp_notebook_instance_size'] notebook_config['key_name'] = os.environ['conf_key_name'] notebook_config['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + notebook_config['project_name'] = (os.environ['project_name']).lower().replace('_', '-') notebook_config['instance_name'] = '{0}-{1}-nb-{2}'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name'], + notebook_config['project_name'], notebook_config['exploratory_name']) notebook_config['expected_primary_image_name'] = '{}-{}-notebook-primary-image'.format( notebook_config['service_base_name'], os.environ['application']) @@ -149,7 +150,7 @@ try: print('[INSTALLING USERs KEY]') logging.info('[INSTALLING USERs KEY]') - additional_config = {"user_keyname": os.environ['edge_user_name'], + additional_config = {"user_keyname": os.environ['project_name'], "user_keydir": os.environ['conf_key_dir']} params = "--hostname {} --keyfile {} --additional_config '{}' --user {}".format( instance_hostname, notebook_config['ssh_key_path'], json.dumps(additional_config), @@ -253,7 +254,7 @@ print("Private IP: {}".format(ip_address)) print("Instance type: {}".format(notebook_config['instance_type'])) print("Key name: {}".format(notebook_config['key_name'])) - print("User key name: {}".format(os.environ['edge_user_name'])) + print("User key name: {}".format(os.environ['project_name'])) print("TensorBoard URL: {}".format(tensorboard_url)) print("TensorBoard log dir: /var/log/tensorboard") print("Jupyter URL: {}".format(jupyter_ip_url)) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py index 1b3602baf8..7c387b2f41 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py @@ -33,7 +33,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -49,8 +49,9 @@ notebook_config['instance_type'] = os.environ['gcp_notebook_instance_size'] notebook_config['key_name'] = os.environ['conf_key_name'] notebook_config['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + notebook_config['project_name'] = (os.environ['project_name']).lower().replace('_', '-') notebook_config['instance_name'] = '{0}-{1}-nb-{2}'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name'], + notebook_config['project_name'], notebook_config['exploratory_name']) notebook_config['expected_primary_image_name'] = '{}-{}-notebook-primary-image'.format( notebook_config['service_base_name'], os.environ['application']) @@ -165,7 +166,7 @@ try: print('[INSTALLING USERs KEY]') logging.info('[INSTALLING USERs KEY]') - additional_config = {"user_keyname": os.environ['edge_user_name'], + additional_config = {"user_keyname": os.environ['project_name'], "user_keydir": os.environ['conf_key_dir']} params = "--hostname {} --keyfile {} --additional_config '{}' --user {}".format( instance_hostname, notebook_config['ssh_key_path'], json.dumps(additional_config), @@ -267,7 +268,7 @@ print("Private IP: {}".format(ip_address)) print("Instance type: {}".format(notebook_config['instance_type'])) print("Key name: {}".format(notebook_config['key_name'])) - print("User key name: {}".format(os.environ['edge_user_name'])) + print("User key name: {}".format(os.environ['project_name'])) print("Zeppelin URL: {}".format(zeppelin_ip_url)) print("Ungit URL: {}".format(ungit_ip_url)) print('SSH access (from Edge node, via IP address): ssh -i {0}.pem {1}@{2}'.format(notebook_config['key_name'], From 33341832213aea991f376986debed16dcf8776fa Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 12:01:21 +0300 Subject: [PATCH 286/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/meta_lib.py | 21 +++++++++++++++++++ .../gcp/common_create_service_account.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index fa8b5a23a4..176bda4016 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -263,6 +263,27 @@ def get_role(self, role_name): file=sys.stdout)})) traceback.print_exc(file=sys.stdout) + def get_role_status(self, role_name): + request = self.service_iam.projects().roles().list(name='projects/{}/roles/{}'.format(self.project, + role_name.replace('-', + '_'))) + try: + return request['showDeleted'] + print('Deleted roles:') + print(request['showDeleted']) + except errors.HttpError as err: + if err.resp.status == 404: + return '' + else: + raise err + except Exception as err: + logging.info( + "Unable to get IAM role: " + str(err) + "\n Traceback: " + traceback.print_exc(file=sys.stdout)) + append_result(str({"error": "Unable to get IAM role", + "error_message": str(err) + "\n Traceback: " + traceback.print_exc( + file=sys.stdout)})) + traceback.print_exc(file=sys.stdout) + def get_static_address(self, region, static_address_name): request = self.service.addresses().get(project=self.project, region=region, address=static_address_name) try: diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index 90e4400af2..d43a733a8c 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -41,7 +41,7 @@ else: print("Creating Service account {}".format(args.service_account_name)) GCPActions().create_service_account(args.service_account_name) - if GCPMeta().get_role(args.role_name): + if GCPMeta().get_role(args.role_name) and GCPMeta().get_role_status(args.role_name) != 'True': print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) else: if args.policy_path == '': From 4e44963a9f2c1be7f4c2540d5b92f409fc59f33b Mon Sep 17 00:00:00 2001 From: bhliva Date: Mon, 8 Jul 2019 12:28:54 +0300 Subject: [PATCH 287/357] DLAB-849 fixed bug connected with resource scheduler --- .../dlab/backendapi/dao/SchedulerJobDAO.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java index 99f6b1b317..597d0f9fb5 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java @@ -131,11 +131,13 @@ public List getExploratorySchedulerWithStatusAndClusterLastAct and( eq(STATUS, status.toString()), schedulerNotNullCondition(), - eq(CONSIDER_INACTIVITY_FLAG, true), - or(eq(COMPUTATIONAL_RESOURCES, Collections.emptyList()), - and(ne(COMPUTATIONAL_RESOURCES, Collections.emptyList()), - Filters.elemMatch(COMPUTATIONAL_RESOURCES, - lte(LAST_ACTIVITY, lastActivity)))) + or(and(eq(CONSIDER_INACTIVITY_FLAG, true), + or(eq(COMPUTATIONAL_RESOURCES, Collections.emptyList()), + and(ne(COMPUTATIONAL_RESOURCES, Collections.emptyList()), + Filters.elemMatch(COMPUTATIONAL_RESOURCES, + lte(LAST_ACTIVITY, lastActivity))))), + eq(CONSIDER_INACTIVITY_FLAG, false) + ) ), fields(excludeId(), include(USER, EXPLORATORY_NAME, SCHEDULER_DATA)))) .map(d -> convertFromDocument(d, SchedulerJobData.class)) @@ -159,9 +161,11 @@ public List getComputationalSchedulerDataWithOneOfStatus(UserI .collect(toList()); } - public List getComputationalSchedulerDataWithOneOfStatus(UserInstanceStatus exploratoryStatus, UserInstanceStatus... statuses) { + public List getComputationalSchedulerDataWithOneOfStatus(UserInstanceStatus exploratoryStatus, + UserInstanceStatus... statuses) { return stream(computationalResourcesWithScheduler(exploratoryStatus)) - .map(doc -> computationalSchedulerData(doc, statuses).map(compResource -> toSchedulerData(doc, compResource))) + .map(doc -> computationalSchedulerData(doc, statuses).map(compResource -> toSchedulerData(doc, + compResource))) .flatMap(Function.identity()) .collect(toList()); } From de2f9ec9302e37c5bfda0b20aaf72e6411daa138 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 12:49:31 +0300 Subject: [PATCH 288/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/meta_lib.py | 13 +++++++------ .../scripts/gcp/common_create_service_account.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index 176bda4016..651cdfae04 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -264,13 +264,14 @@ def get_role(self, role_name): traceback.print_exc(file=sys.stdout) def get_role_status(self, role_name): - request = self.service_iam.projects().roles().list(name='projects/{}/roles/{}'.format(self.project, - role_name.replace('-', - '_'))) + request = self.service_iam.projects().roles().list(parent='projects/{}'.format(self.project,)) + try: - return request['showDeleted'] - print('Deleted roles:') - print(request['showDeleted']) + for name in request['name']: + if request['name'] == role_name.replace('-','_'): + return request['deleted'] + print('Deleted roles:') + print(request['deleted']) except errors.HttpError as err: if err.resp.status == 404: return '' diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index d43a733a8c..5e2aab81a9 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -41,7 +41,7 @@ else: print("Creating Service account {}".format(args.service_account_name)) GCPActions().create_service_account(args.service_account_name) - if GCPMeta().get_role(args.role_name) and GCPMeta().get_role_status(args.role_name) != 'True': + if GCPMeta().get_role(args.role_name) and GCPMeta().get_role_status(args.role_name) != 'true': print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) else: if args.policy_path == '': From d349eefa03b2693784c091f389db6e7cc6efdfa1 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 12:53:42 +0300 Subject: [PATCH 289/357] gcp deleted role fix (test) --- infrastructure-provisioning/src/general/lib/gcp/meta_lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index 651cdfae04..92244d635b 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -268,7 +268,7 @@ def get_role_status(self, role_name): try: for name in request['name']: - if request['name'] == role_name.replace('-','_'): + if name == role_name.replace('-','_'): return request['deleted'] print('Deleted roles:') print(request['deleted']) From d6daea6e890aa1e428ac2a9bb3bddc7da2075fa0 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 13:04:48 +0300 Subject: [PATCH 290/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/meta_lib.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index 92244d635b..b307660cd2 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -265,10 +265,11 @@ def get_role(self, role_name): def get_role_status(self, role_name): request = self.service_iam.projects().roles().list(parent='projects/{}'.format(self.project,)) - + print(request) + rn = 'projects/{}/roles/{}'.format(self.project,role_name.replace('-','_')) try: - for name in request['name']: - if name == role_name.replace('-','_'): + for x in request['name']: + if x == rn: return request['deleted'] print('Deleted roles:') print(request['deleted']) From 72c462b72a822707cdaf1791f70e961a1a7cdbb7 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 13:19:33 +0300 Subject: [PATCH 291/357] gcp deleted role fix (test) --- infrastructure-provisioning/src/general/lib/gcp/meta_lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index b307660cd2..41d81b03f0 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -264,7 +264,7 @@ def get_role(self, role_name): traceback.print_exc(file=sys.stdout) def get_role_status(self, role_name): - request = self.service_iam.projects().roles().list(parent='projects/{}'.format(self.project,)) + request = self.service_iam.projects().roles().list(parent='projects/{}'.format(self.project,),showDeleted='true').execute() print(request) rn = 'projects/{}/roles/{}'.format(self.project,role_name.replace('-','_')) try: From 223c5de6fe3bcba961d6c022a8ffb616681aef14 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 13:29:15 +0300 Subject: [PATCH 292/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/meta_lib.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index 41d81b03f0..5f6e11c5f4 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -265,14 +265,14 @@ def get_role(self, role_name): def get_role_status(self, role_name): request = self.service_iam.projects().roles().list(parent='projects/{}'.format(self.project,),showDeleted='true').execute() - print(request) + rn = 'projects/{}/roles/{}'.format(self.project,role_name.replace('-','_')) try: - for x in request['name']: - if x == rn: - return request['deleted'] + for role in request['roles']: + if role['name'] == rn: + return role['deleted'] print('Deleted roles:') - print(request['deleted']) + print(role['deleted']) except errors.HttpError as err: if err.resp.status == 404: return '' From e6fa8998b174d182c9fc20a92a3a13a18ab715a3 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 15:42:22 +0300 Subject: [PATCH 293/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/meta_lib.py | 5 +++-- .../general/scripts/gcp/common_create_service_account.py | 4 +++- .../src/general/scripts/gcp/project_prepare.py | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index 5f6e11c5f4..33c2dff634 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -270,9 +270,10 @@ def get_role_status(self, role_name): try: for role in request['roles']: if role['name'] == rn: + print('Deleted roles: ', role['name']) return role['deleted'] - print('Deleted roles:') - print(role['deleted']) + + except errors.HttpError as err: if err.resp.status == 404: return '' diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index 5e2aab81a9..7c99d51319 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -41,8 +41,10 @@ else: print("Creating Service account {}".format(args.service_account_name)) GCPActions().create_service_account(args.service_account_name) - if GCPMeta().get_role(args.role_name) and GCPMeta().get_role_status(args.role_name) != 'true': + if GCPMeta().get_role(args.role_name): print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) + if GCPMeta().get_role_status(args.role_name) != 'true': + print(GCPMeta().get_role_status(args.role_name)) else: if args.policy_path == '': permissions = [] diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py index dee972f12a..98e301e355 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py @@ -94,9 +94,10 @@ project_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr'] # FUSE in case of absence of user's key - fname = "/root/keys/{}.pub".format(project_conf['user_keyname']) - if not os.path.isfile(fname): - print("USERs PUBLIC KEY DOES NOT EXIST in {}".format(fname)) + try: + project_conf['user_key'] = os.environ['key'] + except KeyError: + print("ADMINSs PUBLIC KEY DOES NOT UPLOADED") sys.exit(1) print("Will create exploratory environment with edge node as access point as following: ".format(json.dumps( From 613b0a2ba8e4ba509ffa0061f55f3be2b775a020 Mon Sep 17 00:00:00 2001 From: bhliva Date: Mon, 8 Jul 2019 15:43:03 +0300 Subject: [PATCH 294/357] DLAB-856 fixed bug connected with EMR creation on AWS --- .../aws/ComputationalResourceAws.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java index 68771ad131..222d0b9c77 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java @@ -279,16 +279,18 @@ private void validate(UserInfo userInfo, AwsComputationalCreateForm formDTO) { "."); } - int slaveSpotInstanceBidPct = formDTO.getSlaveInstanceSpotPctPrice(); - if (formDTO.getSlaveInstanceSpot() && (slaveSpotInstanceBidPct < configuration.getMinEmrSpotInstanceBidPct() - || slaveSpotInstanceBidPct > configuration.getMaxEmrSpotInstanceBidPct())) { - log.debug("Creating computational resource {} for user {} fail: Spot instances bidding percentage value " + - "out of the boundaries. Minimum is {}, maximum is {}", - formDTO.getName(), userInfo.getName(), configuration.getMinEmrSpotInstanceBidPct(), - configuration.getMaxEmrSpotInstanceBidPct()); - throw new DlabException("Spot instances bidding percentage value out of the boundaries. Minimum is " + - configuration.getMinEmrSpotInstanceBidPct() + ", maximum is " + - configuration.getMaxEmrSpotInstanceBidPct() + "."); + if (formDTO.getSlaveInstanceSpotPctPrice() != null){ + int slaveSpotInstanceBidPct = formDTO.getSlaveInstanceSpotPctPrice(); + if (formDTO.getSlaveInstanceSpot() && (slaveSpotInstanceBidPct < configuration.getMinEmrSpotInstanceBidPct() + || slaveSpotInstanceBidPct > configuration.getMaxEmrSpotInstanceBidPct())) { + log.debug("Creating computational resource {} for user {} fail: Spot instances bidding percentage value " + + "out of the boundaries. Minimum is {}, maximum is {}", + formDTO.getName(), userInfo.getName(), configuration.getMinEmrSpotInstanceBidPct(), + configuration.getMaxEmrSpotInstanceBidPct()); + throw new DlabException("Spot instances bidding percentage value out of the boundaries. Minimum is " + + configuration.getMinEmrSpotInstanceBidPct() + ", maximum is " + + configuration.getMaxEmrSpotInstanceBidPct() + "."); + } } } } From a45cdfd24c6990e18e713b43e3a3d12552d787cb Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 15:51:55 +0300 Subject: [PATCH 295/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/actions_lib.py | 27 +++++++++++++++++++ .../src/general/lib/gcp/meta_lib.py | 2 +- .../gcp/common_create_service_account.py | 4 +-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py index f32bae911a..0e416bd5c8 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py @@ -564,6 +564,33 @@ def create_role(self, role_name, permissions): file=sys.stdout)})) traceback.print_exc(file=sys.stdout) + def undelete_role(self, role_name, permissions): + request = self.service_iam.projects().roles().undelete( + name='projects/{}/roles/{}'.format(self.project, role_name.replace('-', '_'))) + try: + result = request.execute() + role = meta_lib.GCPMeta().get_role(role_name) + if 'deleted' in role: + role_removed = True + else: + role_removed = False + while role_removed: + time.sleep(5) + role = meta_lib.GCPMeta().get_role(role_name) + if 'deleted' in role: + role_removed = True + time.sleep(30) + print('IAM role {} restored.'.format(role_name)) + return result + except Exception as err: + logging.info( + "Unable to restore IAM role: " + str(err) + "\n Traceback: " + traceback.print_exc( + file=sys.stdout)) + append_result(str({"error": "Unable to restore IAM role", + "error_message": str(err) + "\n Traceback: " + traceback.print_exc( + file=sys.stdout)})) + traceback.print_exc(file=sys.stdout) + def remove_role(self, role_name): request = self.service_iam.projects().roles().delete( name='projects/{}/roles/{}'.format(self.project, role_name.replace('-', '_'))) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index 33c2dff634..8f9b1778e4 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -270,7 +270,7 @@ def get_role_status(self, role_name): try: for role in request['roles']: if role['name'] == rn: - print('Deleted roles: ', role['name']) + print('Deleted roles: ', role['name'], role['deleted']) return role['deleted'] diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index 7c99d51319..c51e6c5dd8 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -43,8 +43,8 @@ GCPActions().create_service_account(args.service_account_name) if GCPMeta().get_role(args.role_name): print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) - if GCPMeta().get_role_status(args.role_name) != 'true': - print(GCPMeta().get_role_status(args.role_name)) + if GCPMeta().get_role_status(args.role_name) == 'true': + GCPActions().create_role(args.role_name) else: if args.policy_path == '': permissions = [] From 72a8f8ca82c1489e8c7d755e54bcb8688444b3bd Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 16:27:10 +0300 Subject: [PATCH 296/357] gcp deleted role fix (test) --- .../scripts/gcp/common_create_service_account.py | 6 +++++- .../scripts/gcp/common_prepare_notebook.py | 16 ++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index c51e6c5dd8..eb413bba99 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -43,8 +43,12 @@ GCPActions().create_service_account(args.service_account_name) if GCPMeta().get_role(args.role_name): print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) + print(GCPMeta().get_role_status(args.role_name)) if GCPMeta().get_role_status(args.role_name) == 'true': - GCPActions().create_role(args.role_name) + GCPActions().undelete_role(args.role_name) + sys.exit(1) + else: + sys.exit(1) else: if args.policy_path == '': permissions = [] diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py index 93c49286d0..fef9704c84 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py @@ -31,7 +31,7 @@ if __name__ == "__main__": instance_class = 'notebook' - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', @@ -42,11 +42,13 @@ notebook_config = dict() notebook_config['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') notebook_config['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + notebook_config['project_name'] = (os.environ['project_name']).lower().replace('_', '-') + notebook_config['project_tag'] = (os.environ['project_tag']).lower().replace('_', '-') notebook_config['region'] = os.environ['gcp_region'] notebook_config['zone'] = os.environ['gcp_zone'] edge_status = GCPMeta().get_instance_status('{0}-{1}-edge'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name'])) + notebook_config['project_name'])) if edge_status != 'RUNNING': logging.info('ERROR: Edge node is unavailable! Aborting...') print('ERROR: Edge node is unavailable! Aborting...') @@ -68,11 +70,11 @@ except: notebook_config['exploratory_name'] = '' notebook_config['subnet_name'] = '{0}-{1}-subnet'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name']) + notebook_config['project_name']) notebook_config['instance_size'] = os.environ['gcp_notebook_instance_size'] notebook_config['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name']) notebook_config['notebook_service_account_name'] = '{}-{}-ps'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name']).replace('_', '-') + notebook_config['project_name']).replace('_', '-') if os.environ['conf_os_family'] == 'debian': initial_user = 'ubuntu' @@ -81,7 +83,7 @@ initial_user = 'ec2-user' sudo_group = 'wheel' notebook_config['instance_name'] = '{0}-{1}-nb-{2}'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name'], + notebook_config['project_name'], notebook_config['exploratory_name']) notebook_config['primary_disk_size'] = (lambda x: '30' if x == 'deeplearning' else '12')(os.environ['application']) notebook_config['secondary_disk_size'] = os.environ['notebook_disk_size'] @@ -114,9 +116,11 @@ notebook_config['gpu_accelerator_type'] = os.environ['gcp_gpu_accelerator_type'] notebook_config['network_tag'] = '{0}-{1}-ps'.format(notebook_config['service_base_name'], - notebook_config['edge_user_name']) + notebook_config['project_name']) notebook_config['labels'] = {"name": notebook_config['instance_name'], "sbn": notebook_config['service_base_name'], + "project_name": notebook_config['project_name'], + "project_tag": notebook_config['project_tag'], "user": notebook_config['edge_user_name'], "product": "dlab"} # launching instance for notebook server From 4ff85217794729a7b65ce20ded724b3f87e6bd98 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 17:16:49 +0300 Subject: [PATCH 297/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/actions_lib.py | 2 +- .../general/scripts/gcp/project_terminate.py | 160 ++++++++++++++++++ 2 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py index 0e416bd5c8..39606cb1b7 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py @@ -564,7 +564,7 @@ def create_role(self, role_name, permissions): file=sys.stdout)})) traceback.print_exc(file=sys.stdout) - def undelete_role(self, role_name, permissions): + def undelete_role(self, role_name): request = self.service_iam.projects().roles().undelete( name='projects/{}/roles/{}'.format(self.project, role_name.replace('-', '_'))) try: diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py new file mode 100644 index 0000000000..98a03db1d3 --- /dev/null +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py @@ -0,0 +1,160 @@ +#!/usr/bin/python + +# ***************************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ****************************************************************************** + +import json +from dlab.fab import * +from dlab.meta_lib import * +import sys, time, os +from dlab.actions_lib import * + + +def terminate_edge_node(user_name, service_base_name, region, zone): + print("Terminating Dataengine-service clusters") + try: + labels = [ + {'sbn': service_base_name}, + {'user': user_name} + ] + clusters_list = meta_lib.GCPMeta().get_dataproc_list(labels) + if clusters_list: + for cluster_name in clusters_list: + actions_lib.GCPActions().delete_dataproc_cluster(cluster_name, region) + print('The Dataproc cluster {} has been terminated successfully'.format(cluster_name)) + else: + print("There are no Dataproc clusters to terminate.") + except Exception as err: + print('Error: {0}'.format(err)) + sys.exit(1) + + print("Terminating EDGE and notebook instances") + base = '{}-{}'.format(service_base_name, user_name) + keys = ['edge', 'ps', 'ip', 'bucket', 'subnet'] + targets = ['{}-{}'.format(base, k) for k in keys] + try: + instances = GCPMeta().get_list_instances(zone, base) + if 'items' in instances: + for i in instances['items']: + if 'user' in i['labels'] and user_name == i['labels']['user']: + GCPActions().remove_instance(i['name'], zone) + except Exception as err: + print('Error: {0}'.format(err)) + sys.exit(1) + + print("Removing static addresses") + try: + static_addresses = GCPMeta().get_list_static_addresses(region, base) + if 'items' in static_addresses: + for i in static_addresses['items']: + if bool(set(targets) & set([i['name']])): + GCPActions().remove_static_address(i['name'], region) + except Exception as err: + print('Error: {0}'.format(err)) + sys.exit(1) + + print("Removing storage bucket") + try: + buckets = GCPMeta().get_list_buckets(base) + if 'items' in buckets: + for i in buckets['items']: + if bool(set(targets) & set([i['name']])): + GCPActions().remove_bucket(i['name']) + except Exception as err: + print('Error: {0}'.format(err)) + sys.exit(1) + + print("Removing firewalls") + try: + firewalls = GCPMeta().get_list_firewalls(base) + if 'items' in firewalls: + for i in firewalls['items']: + if bool(set(targets) & set(i['targetTags'])): + GCPActions().remove_firewall(i['name']) + except Exception as err: + print('Error: {0}'.format(err)) + sys.exit(1) + + print("Removing Service accounts and roles") + try: + list_service_accounts = GCPMeta().get_list_service_accounts() + for service_account in (set(targets) & set(list_service_accounts)): + GCPActions().remove_service_account(service_account) + list_roles_names = GCPMeta().get_list_roles() + for role in (set(targets) & set(list_roles_names)): + GCPActions().remove_role(role) + except Exception as err: + print('Error: {0}'.format(err)) + sys.exit(1) + + print("Removing subnets") + try: + list_subnets = GCPMeta().get_list_subnetworks(region, '', base) + if 'items' in list_subnets: + vpc_selflink = list_subnets['items'][0]['network'] + vpc_name = vpc_selflink.split('/')[-1] + subnets = GCPMeta().get_list_subnetworks(region, vpc_name, base) + for i in subnets['items']: + if bool(set(targets) & set([i['name']])): + GCPActions().remove_subnet(i['name'], region) + except Exception as err: + print('Error: {0}'.format(err)) + sys.exit(1) + + +if __name__ == "__main__": + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) + local_log_filepath = "/logs/edge/" + local_log_filename + logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', + level=logging.DEBUG, + filename=local_log_filepath) + + # generating variables dictionary + print('Generating infrastructure names and tags') + edge_conf = dict() + edge_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') + edge_conf['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') + edge_conf['region'] = os.environ['gcp_region'] + edge_conf['zone'] = os.environ['gcp_zone'] + + try: + logging.info('[TERMINATE EDGE]') + print('[TERMINATE EDGE]') + try: + terminate_edge_node(edge_conf['edge_user_name'], edge_conf['service_base_name'], + edge_conf['region'], edge_conf['zone']) + except Exception as err: + traceback.print_exc() + append_result("Failed to terminate edge.", str(err)) + except Exception as err: + print('Error: {0}'.format(err)) + sys.exit(1) + + try: + with open("/root/result.json", 'w') as result: + res = {"service_base_name": edge_conf['service_base_name'], + "user_name": edge_conf['edge_user_name'], + "Action": "Terminate edge node"} + print(json.dumps(res)) + result.write(json.dumps(res)) + except: + print("Failed writing results.") + sys.exit(0) \ No newline at end of file From 1d2f44172dc5ceb6d0e5916839fdbbde7c581c7e Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 17:22:22 +0300 Subject: [PATCH 298/357] gcp deleted role fix (test) --- .../src/general/scripts/gcp/common_create_service_account.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index eb413bba99..8c2dcc84b5 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -43,11 +43,13 @@ GCPActions().create_service_account(args.service_account_name) if GCPMeta().get_role(args.role_name): print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) - print(GCPMeta().get_role_status(args.role_name)) + if GCPMeta().get_role_status(args.role_name) == 'true': + print('Yes, true') GCPActions().undelete_role(args.role_name) sys.exit(1) else: + print('No, false') sys.exit(1) else: if args.policy_path == '': From 92e85e3b48499a2329f2710c49ca2189f3224683 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 17:27:25 +0300 Subject: [PATCH 299/357] gcp deleted role fix (test) --- .../src/general/scripts/gcp/common_create_service_account.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index 8c2dcc84b5..54166c353e 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -43,8 +43,9 @@ GCPActions().create_service_account(args.service_account_name) if GCPMeta().get_role(args.role_name): print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) - - if GCPMeta().get_role_status(args.role_name) == 'true': + role_status = GCPMeta().get_role_status(args.role_name) + print('Status: ', role_status) + if role_status == 'true': print('Yes, true') GCPActions().undelete_role(args.role_name) sys.exit(1) From dadbe02320141661f356b89d7ccd1a4823c1a5e4 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 17:30:47 +0300 Subject: [PATCH 300/357] gcp deleted role fix (test) --- .../src/general/scripts/gcp/common_create_service_account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index 54166c353e..658e064fd8 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -45,7 +45,7 @@ print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) role_status = GCPMeta().get_role_status(args.role_name) print('Status: ', role_status) - if role_status == 'true': + if role_status == 'True': print('Yes, true') GCPActions().undelete_role(args.role_name) sys.exit(1) From 97a191bd2717528ef91d9730c962ee526caecf06 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 17:36:48 +0300 Subject: [PATCH 301/357] gcp deleted role fix (test) --- .../src/general/scripts/gcp/common_create_service_account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index 658e064fd8..b9f1d6de6e 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -45,7 +45,7 @@ print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) role_status = GCPMeta().get_role_status(args.role_name) print('Status: ', role_status) - if role_status == 'True': + if role_status == True: print('Yes, true') GCPActions().undelete_role(args.role_name) sys.exit(1) From 35fc6a37f67f12904ca557a71d6b56a2443c51af Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 17:49:02 +0300 Subject: [PATCH 302/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/actions_lib.py | 8 ++++- .../general/scripts/gcp/project_terminate.py | 30 +++++++++---------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py index 39606cb1b7..1204f30ce1 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py @@ -566,7 +566,13 @@ def create_role(self, role_name, permissions): def undelete_role(self, role_name): request = self.service_iam.projects().roles().undelete( - name='projects/{}/roles/{}'.format(self.project, role_name.replace('-', '_'))) + name='projects/{}/roles/{}'.format(self.project, role_name.replace('-', '_')), + body= + { + "roleId": role_name.replace('-', '_'), + "role": { + "title": role_name, + }}) try: result = request.execute() role = meta_lib.GCPMeta().get_role(role_name) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py index 98a03db1d3..419346d2f5 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py @@ -28,12 +28,12 @@ from dlab.actions_lib import * -def terminate_edge_node(user_name, service_base_name, region, zone): +def terminate_edge_node(project_name, service_base_name, region, zone): print("Terminating Dataengine-service clusters") try: labels = [ {'sbn': service_base_name}, - {'user': user_name} + {'project_name': project_name} ] clusters_list = meta_lib.GCPMeta().get_dataproc_list(labels) if clusters_list: @@ -47,14 +47,14 @@ def terminate_edge_node(user_name, service_base_name, region, zone): sys.exit(1) print("Terminating EDGE and notebook instances") - base = '{}-{}'.format(service_base_name, user_name) + base = '{}-{}'.format(service_base_name, project_name) keys = ['edge', 'ps', 'ip', 'bucket', 'subnet'] targets = ['{}-{}'.format(base, k) for k in keys] try: instances = GCPMeta().get_list_instances(zone, base) if 'items' in instances: for i in instances['items']: - if 'user' in i['labels'] and user_name == i['labels']['user']: + if 'project_name' in i['labels'] and project_name == i['labels']['project_name']: GCPActions().remove_instance(i['name'], zone) except Exception as err: print('Error: {0}'.format(err)) @@ -121,26 +121,26 @@ def terminate_edge_node(user_name, service_base_name, region, zone): if __name__ == "__main__": - local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'], os.environ['request_id']) - local_log_filepath = "/logs/edge/" + local_log_filename + local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'], os.environ['request_id']) + local_log_filepath = "/logs/project/" + local_log_filename logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.DEBUG, filename=local_log_filepath) # generating variables dictionary print('Generating infrastructure names and tags') - edge_conf = dict() - edge_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') - edge_conf['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-') - edge_conf['region'] = os.environ['gcp_region'] - edge_conf['zone'] = os.environ['gcp_zone'] + project_conf = dict() + project_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-') + project_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-') + project_conf['region'] = os.environ['gcp_region'] + project_conf['zone'] = os.environ['gcp_zone'] try: logging.info('[TERMINATE EDGE]') print('[TERMINATE EDGE]') try: - terminate_edge_node(edge_conf['edge_user_name'], edge_conf['service_base_name'], - edge_conf['region'], edge_conf['zone']) + terminate_edge_node(project_conf['project_name'], project_conf['service_base_name'], + project_conf['region'], project_conf['zone']) except Exception as err: traceback.print_exc() append_result("Failed to terminate edge.", str(err)) @@ -151,8 +151,8 @@ def terminate_edge_node(user_name, service_base_name, region, zone): try: with open("/root/result.json", 'w') as result: res = {"service_base_name": edge_conf['service_base_name'], - "user_name": edge_conf['edge_user_name'], - "Action": "Terminate edge node"} + "project_name": edge_conf['project_name'], + "Action": "Terminate project"} print(json.dumps(res)) result.write(json.dumps(res)) except: From 32a3c9947e761c96d2653a57cde0fc045fd4b414 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 18:01:22 +0300 Subject: [PATCH 303/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/actions_lib.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py index 1204f30ce1..9358658728 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py @@ -569,10 +569,8 @@ def undelete_role(self, role_name): name='projects/{}/roles/{}'.format(self.project, role_name.replace('-', '_')), body= { - "roleId": role_name.replace('-', '_'), - "role": { - "title": role_name, - }}) + "title": role_name + }) try: result = request.execute() role = meta_lib.GCPMeta().get_role(role_name) From cfd96ad250e3ce83547fffb0dd0a1cac73e7af88 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 18:05:44 +0300 Subject: [PATCH 304/357] gcp deleted role fix (test) --- .../src/general/lib/gcp/actions_lib.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py index 9358658728..dbbeea1554 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py @@ -568,9 +568,7 @@ def undelete_role(self, role_name): request = self.service_iam.projects().roles().undelete( name='projects/{}/roles/{}'.format(self.project, role_name.replace('-', '_')), body= - { - "title": role_name - }) + { }) try: result = request.execute() role = meta_lib.GCPMeta().get_role(role_name) From 3a0ef1a4b011fd0918687a375667c701bdfd4ad3 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 18:18:44 +0300 Subject: [PATCH 305/357] gcp deleted role fixed --- .../scripts/gcp/common_create_service_account.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py index b9f1d6de6e..a0f5046b49 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_service_account.py @@ -42,16 +42,11 @@ print("Creating Service account {}".format(args.service_account_name)) GCPActions().create_service_account(args.service_account_name) if GCPMeta().get_role(args.role_name): - print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) - role_status = GCPMeta().get_role_status(args.role_name) - print('Status: ', role_status) - if role_status == True: - print('Yes, true') + if GCPMeta().get_role_status(args.role_name) == True: + print('Restoring deleted role') GCPActions().undelete_role(args.role_name) - sys.exit(1) else: - print('No, false') - sys.exit(1) + print("REQUESTED ROLE {} ALREADY EXISTS".format(args.role_name)) else: if args.policy_path == '': permissions = [] From 732f4fad46ac67a8580451bced8296af861abf9e Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Mon, 8 Jul 2019 18:20:57 +0300 Subject: [PATCH 306/357] gcp deleted role fixed --- infrastructure-provisioning/src/general/lib/gcp/meta_lib.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py index 8f9b1778e4..5e7a96b529 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py @@ -265,15 +265,11 @@ def get_role(self, role_name): def get_role_status(self, role_name): request = self.service_iam.projects().roles().list(parent='projects/{}'.format(self.project,),showDeleted='true').execute() - rn = 'projects/{}/roles/{}'.format(self.project,role_name.replace('-','_')) try: for role in request['roles']: if role['name'] == rn: - print('Deleted roles: ', role['name'], role['deleted']) return role['deleted'] - - except errors.HttpError as err: if err.resp.status == 404: return '' From 6b3837dd05356f7fdd4118a70501be843e8c31bc Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 9 Jul 2019 11:00:20 +0300 Subject: [PATCH 307/357] project_tg gcp --- .../src/general/scripts/gcp/project_prepare.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py index 98e301e355..a178f8bfea 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py @@ -43,6 +43,7 @@ project_conf['key_name'] = os.environ['conf_key_name'] project_conf['user_keyname'] = os.environ['project_name'] project_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-') + project_conf['project_tag'] = (os.environ['project_tag']) try: if os.environ['gcp_vpc_name'] == '': raise KeyError @@ -89,7 +90,8 @@ project_conf['network_tag'] = project_conf['instance_name'] project_conf['instance_labels'] = {"name": project_conf['instance_name'], "sbn": project_conf['service_base_name'], - "user": project_conf['project_name'], + "project_name": project_conf['project_name'], + "project_tag": project_conf['project_tag'], "product": "dlab"} project_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr'] From 40e08f10da2ae1b25fcff2508a2cb20475003e22 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Tue, 9 Jul 2019 12:10:36 +0300 Subject: [PATCH 308/357] aws project tags foxed --- .../aws/common_create_notebook_image.py | 8 ++--- .../common_notebook_configure_dataengine.py | 5 ++-- .../scripts/aws/common_prepare_notebook.py | 5 ++-- .../general/scripts/aws/project_prepare.py | 30 +++++++++++-------- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_create_notebook_image.py b/infrastructure-provisioning/src/general/scripts/aws/common_create_notebook_image.py index 3d418c1109..db236ec071 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_create_notebook_image.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_create_notebook_image.py @@ -34,18 +34,18 @@ image_conf = dict() create_aws_config_files() image_conf['service_base_name'] = os.environ['conf_service_base_name'] - image_conf['project_tag'] = os.environ['project_name'] + image_conf['project_name'] = os.environ['project_name'] image_conf['instance_name'] = os.environ['notebook_instance_name'] image_conf['instance_tag'] = '{}-Tag'.format(image_conf['service_base_name']) image_conf['application'] = os.environ['application'] image_conf['image_name'] = os.environ['notebook_image_name'].lower().replace('_', '-') image_conf['full_image_name'] = '{}-{}-{}-{}'.format(image_conf['service_base_name'], - image_conf['project_tag'], + image_conf['project_name'], image_conf['application'], image_conf['image_name']).lower() image_conf['tags'] = {"Name": image_conf['service_base_name'], "SBN": image_conf['service_base_name'], - "Project": image_conf['project_tag'], + "Project": image_conf['project_name'], "Image": image_conf['image_name'], "FIN": image_conf['full_image_name'], os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']} @@ -61,7 +61,7 @@ with open("/root/result.json", 'w') as result: res = {"notebook_image_name": image_conf['image_name'], "full_image_name": image_conf['full_image_name'], - "project_tag": image_conf['project_tag'], + "project_name": image_conf['project_name'], "application": image_conf['application'], "status": "created", "Action": "Create image from notebook"} diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py index 8e969c2d69..efedcd8a63 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py @@ -55,8 +55,9 @@ notebook_config['service_base_name'] = os.environ['conf_service_base_name'] notebook_config['region'] = os.environ['aws_region'] notebook_config['tag_name'] = notebook_config['service_base_name'] + '-Tag' - notebook_config['project_tag'] = os.environ['project_name'] - notebook_config['cluster_name'] = notebook_config['service_base_name'] + '-' + notebook_config['project_tag'] + \ + notebook_config['project_name'] = os.environ['project_name'] + notebook_config['project_tag'] = os.environ['project_tag'] + notebook_config['cluster_name'] = notebook_config['service_base_name'] + '-' + notebook_config['project_name'] + \ '-de-' + notebook_config['exploratory_name'] + '-' + \ notebook_config['computational_name'] notebook_config['master_node_name'] = notebook_config['cluster_name'] + '-m' diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py index 4ae9e1767c..72ddb8afd5 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py @@ -108,9 +108,8 @@ os.environ['notebook_disk_size'], notebook_config['primary_disk_size']) try: local("~/scripts/{}.py {}".format('common_create_instance', params)) - notebook_instance = get_instance_by_name(notebook_config['tag_name'], notebook_config['instance_name']) - project_tag = {"Key": 'project_tag', "Value": os.environ['project_name']} - create_tag(notebook_instance, project_tag) +# notebook_instance = get_instance_by_name(notebook_config['tag_name'], notebook_config['instance_name']) +# create_tag(notebook_instance, os.environ['tag']) except: traceback.print_exc() raise Exception diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py index 2e76c81b2c..0e5edd3af5 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py @@ -41,8 +41,8 @@ print('Generating infrastructure names and tags') project_conf = dict() project_conf['service_base_name'] = os.environ['conf_service_base_name'] - project_conf['project_tag'] = os.environ['project_name'] - project_conf['custom_tag'] = os.environ['project_tag'] + project_conf['project_name'] = os.environ['project_name'] + project_conf['project_tag'] = os.environ['project_tag'] project_conf['key_name'] = os.environ['conf_key_name'] project_conf['public_subnet_id'] = os.environ['aws_subnet_id'] project_conf['vpc_id'] = os.environ['aws_vpc_id'] @@ -113,6 +113,15 @@ format(json.dumps(project_conf, sort_keys=True, indent=4, separators=(',', ': ')))) logging.info(json.dumps(project_conf)) + try: + os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + ';project_tag:{}'.format( + project_conf['project_tag'] + ';project_name:{}'.format( + project_conf['project_name']) + except KeyError: + os.environ['conf_additional_tags'] = 'project_tag:{0}; project_name:{1}'.format(project_conf['project_tag'], + project_conf['project_name']) + print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) + try: project_conf['vpc2_id'] = os.environ['aws_vpc2_id'] project_conf['tag_name'] = '{}-secondary-Tag'.format(project_conf['service_base_name']) @@ -139,12 +148,14 @@ sys.exit(1) tag = {"Key": project_conf['tag_name'], - "Value": "{0}-{1}-subnet".format(project_conf['service_base_name'], project_conf['project_tag'])} + "Value": "{0}-{1}-subnet".format(project_conf['service_base_name'], project_conf['project_name'])} project_conf['private_subnet_cidr'] = get_subnet_by_tag(tag) - project_tag = {"Key": 'project_tag', "Value": project_conf['project_tag']} +# project_tag = {"Key": 'project_tag', "Value": project_conf['project_tag']} +# project_name = {"Key": 'project_name', "Value": project_conf['project_name']} subnet_id = get_subnet_by_cidr(project_conf['private_subnet_cidr']) print('subnet id: {}'.format(subnet_id)) - create_tag(subnet_id, project_tag) +# create_tag(subnet_id, project_tag) +# create_tag(subnet_id, project_name) print('NEW SUBNET CIDR CREATED: {}'.format(project_conf['private_subnet_cidr'])) try: @@ -483,12 +494,6 @@ params = "--bucket_name {} --infra_tag_name {} --infra_tag_value {} --region {} --bucket_name_tag {}" \ .format(project_conf['bucket_name'], project_conf['tag_name'], project_conf['bucket_name'], project_conf['region'], project_conf['bucket_name_tag']) - try: - os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + ';project_tag:{}'.format( - project_conf['project_tag']) - except KeyError: - os.environ['conf_additional_tags'] = 'project_tag:{}'.format(project_conf['project_tag']) - print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) try: local("~/scripts/{}.py {}".format('common_create_bucket', params)) except: @@ -542,7 +547,8 @@ try: local("~/scripts/{}.py {}".format('common_create_instance', params)) edge_instance = get_instance_by_name(project_conf['tag_name'], project_conf['edge_instance_name']) - create_tag(edge_instance, project_tag) +# create_tag(edge_instance, project_tag) +# create_tag(edge_instance, project_name) except: traceback.print_exc() raise Exception From ea4fd6152f408ae3be5d7dc8f4595e6bf90d41c9 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 9 Jul 2019 13:23:53 +0300 Subject: [PATCH 309/357] [DLAB-834]: added proper data keys --- .../mock_response/aws/project_create.json | 57 +++++++++++++++++++ .../management-grid.component.html | 18 +++--- 2 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 services/provisioning-service/src/main/resources/mock_response/aws/project_create.json diff --git a/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json b/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json new file mode 100644 index 0000000000..31ca8e5c8a --- /dev/null +++ b/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json @@ -0,0 +1,57 @@ +{ + "status": "ok", + "response": { + "result": { + "tunnel_port": "22", + "full_edge_conf": { + "edge_service_account_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge", + "fw_edge_egress_internal": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-egress-internal", + "dlab_ssh_user": "dlab-user", + "ps_role_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps", + "fw_ps_egress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-egress-public", + "private_ip": "10.10.0.3", + "fw_ps_ingress": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-ingress", + "ssh_key_path": "/root/keys/BDCC-DSS-POC.pem", + "zone": "us-west1-a ", + "fw_edge_egress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-egress-public", + "ami_name": "/projects/ubuntu-os-cloud/global/images/ubuntu-1604-xenial-v20170721", + "edge_role_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge", + "private_subnet_prefix": "24", + "subnet_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-subnet", + "vpc_cidr": "10.10.0.0/16", + "key_name": "${CONF_KEY_NAME}", + "service_base_name": "${CONF_SERVICE_BASE_NAME}", + "static_address_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ip", + "fw_ps_egress_private": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-egress-private", + "vpc_name": "${CONF_SERVICE_BASE_NAME}-ssn-vpc", + "static_ip": "104.198.5.3", + "bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", + "fw_edge_ingress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-ingress-public", + "ps_service_account_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps", + "firewall_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-firewall", + "region": "us-west1", + "fw_common_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps", + "instance_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge", + "user_keyname": "${EDGE_USER_NAME}", + "edge_user_name": "${EDGE_USER_NAME}", + "private_subnet_cidr": "10.10.16.0/24", + "fw_edge_ingress_internal": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-ingress-internal", + "vpc_selflink": "https://www.googleapis.com/compute/v1/projects/or2-msq-epmc-dlab-t1iylu/global/networks/${CONF_SERVICE_BASE_NAME}-ssn-vpc", + "instance_size": "n1-standard-1", + "notebook_firewall_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-firewall" + }, + "key_name": "BDCC-DSS-POC", + "hostname": "104.198.5.3", + "public_ip": "104.198.5.3", + "ip": "10.10.0.3", + "Action": "Create new EDGE server", + "user_own_bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", + "socks_port": "1080", + "notebook_subnet": "10.10.16.0/24", + "project_name": "${PROJECT_NAME}", + "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp" + }, + "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log" + }, + "request_id": "${REQUEST_ID}" +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index ce66673251..7933342349 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -24,14 +24,19 @@ {{ element.user }} + + Type + {{ element.project }} + + Type - {{ element.name }} + {{ element.resource_name || element.resource_type }} Shape / Resource id - {{ element.shape || element.ip }} + {{ element.shape || element.public_ip }} @@ -77,9 +82,7 @@ + : element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' }">
      • -
      -
    • +
      +
    • play_circle_outline Start
      • @@ -114,6 +117,7 @@ + LOADING To start working, please, create new environment From f906c63a6e1e25aada4b5136126877da0231598b Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 9 Jul 2019 13:24:48 +0300 Subject: [PATCH 310/357] [DLAB-834]: added management-data.service --- .../app/administration/management/index.ts | 2 + .../management/management-data.service.ts | 42 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/management/management-data.service.ts diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index 8d03ac0da7..bb6e960f36 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -25,6 +25,7 @@ import { BubbleModule, ConfirmationDialogModule } from '../../shared'; import { MaterialModule } from '../../shared/material.module'; import { ManagementComponent } from './management.component'; +import { EnvironmentsDataService } from './management-data.service'; import { ManagementGridComponent, ReconfirmationDialogComponent } from './management-grid/management-grid.component'; import { ComputationalResourcesModule } from '../../resources/computational/computational-resources-list'; @@ -70,6 +71,7 @@ export * from './management.component'; SsnMonitorComponent, EndpointsComponent, ManageEnvironmentComponent], + providers: [EnvironmentsDataService], exports: [ManagementComponent] }) export class ManagenementModule { } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-data.service.ts new file mode 100644 index 0000000000..090a253595 --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-data.service.ts @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +import { ManageEnvironmentsService } from '../../core/services'; + +@Injectable() +export class EnvironmentsDataService { + + _data = new BehaviorSubject(null); + + constructor(private manageEnvironmentsService: ManageEnvironmentsService) { + this.getAllEnvironmentData(); + } + + public updateEnvironmentData() { + this.getAllEnvironmentData(); + } + + private getAllEnvironmentData() { + this.manageEnvironmentsService.getAllEnvironmentData().subscribe( + (response) => this._data.next(response)); + } +} \ No newline at end of file From bde4c9600ae05a43d6b6a16e52969c3030f8ee0d Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 9 Jul 2019 13:25:31 +0300 Subject: [PATCH 311/357] [DLAB-834]: added proper data keys --- .../management-grid.component.scss | 8 +++- .../management-grid.component.ts | 19 ++++++--- .../management/management.component.html | 9 ++-- .../management/management.component.ts | 42 ++++++++----------- 4 files changed, 41 insertions(+), 37 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss index e2f7646cff..c52342f034 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss @@ -18,30 +18,36 @@ */ .dashboard_table { + .th_user, .th_name { width: 20%; } + .th_shape, .th_status { width: 12% !important; } + .th_resources { width: 33%; } + .dashboard_table_body { td:first-child { cursor: default; } } } + .source .resource-wrap .resource-name .detailed-link { cursor: default !important; } table { width: 100%; + .actions { text-align: right; } -} \ No newline at end of file +} diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts index c6014db209..3e965dc91c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts @@ -24,6 +24,7 @@ import { ToastrService } from 'ngx-toastr'; import { HealthStatusService } from '../../../core/services'; import { ConfirmationDialogType } from '../../../shared'; import { ConfirmationDialogComponent } from '../../../shared/modal-dialog/confirmation-dialog'; +import { EnvironmentsDataService } from '../management-data.service'; export interface ManageAction { action: string; @@ -41,7 +42,11 @@ export interface ManageAction { ] }) export class ManagementGridComponent implements OnInit { - @Input() allEnvironmentData: Array; + // @Input() allEnvironmentData: Array; + + allEnvironmentData: Array; + loading: boolean = false; + @Input() environmentsHealthStatuses: Array; @Input() resources: Array; @Input() isAdmin: boolean; @@ -49,15 +54,17 @@ export class ManagementGridComponent implements OnInit { @Output() refreshGrid: EventEmitter<{}> = new EventEmitter(); @Output() actionToggle: EventEmitter = new EventEmitter(); - displayedColumns: string[] = ['user', 'type', 'shape', 'status', 'resources', 'actions']; + displayedColumns: string[] = ['user', 'type', 'project', 'shape', 'status', 'resources', 'actions']; constructor( private healthStatusService: HealthStatusService, + private environmentsDataService: EnvironmentsDataService, public toastr: ToastrService, public dialog: MatDialog ) { } ngOnInit() { + this.environmentsDataService._data.subscribe(data => this.allEnvironmentData = data); } buildGrid(): void { @@ -74,7 +81,7 @@ export class ManagementGridComponent implements OnInit { result && this.actionToggle.emit({ action, environment, resource }); }); } else { - const type = (environment.name === 'edge node' || environment.type.toLowerCase() === 'edge node') + const type = (environment.resource_type.toLowerCase() === 'edge node') ? ConfirmationDialogType.StopEdgeNode : ConfirmationDialogType.StopExploratory; if (action === 'stop') { @@ -104,9 +111,9 @@ export class ManagementGridComponent implements OnInit { if (notebook.name === 'edge node') { return this.allEnvironmentData .filter(env => env.user === notebook.user) - .some(el => this.inProgress([el]) || this.inProgress(el.resources)); - } else if (notebook.resources.length) { - return this.inProgress(notebook.resources); + .some(el => this.inProgress([el]) || this.inProgress(el.computational_resources)); + } else if (notebook.computational_resources.length) { + return this.inProgress(notebook.computational_resources); } } return false; diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index 16e9f5d392..63c253f7b9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -38,9 +38,8 @@
      - + -
    \ No newline at end of file +
    diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index 0db2a3ce7e..abcf6e31f2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -36,6 +36,8 @@ import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; import { ManageEnvironmentComponent } from './manage-environment/manage-environment-dilog.component'; import { EndpointsComponent } from './endpoints/endpoints.component'; +import { EnvironmentsDataService } from './management-data.service'; + @Component({ selector: 'environments-management', templateUrl: './management.component.html', @@ -55,7 +57,8 @@ export class ManagementComponent implements OnInit { private backupService: BackupService, private manageEnvironmentsService: ManageEnvironmentsService, private userResourceService: UserResourceService, - private storageService: StorageService + private storageService: StorageService, + private environmentsDataService: EnvironmentsDataService ) { } ngOnInit() { @@ -65,6 +68,7 @@ export class ManagementComponent implements OnInit { public buildGrid() { this.getEnvironmentHealthStatus(); + this.environmentsDataService.updateEnvironmentData(); } public manageEnvironmentAction($event) { @@ -72,8 +76,8 @@ export class ManagementComponent implements OnInit { .environmentManagement( $event.environment.user, $event.action, - $event.environment.name === 'edge node' ? 'edge' : $event.environment.name, - $event.resource ? $event.resource.computational_name : null + $event.environment.resource_type === 'edge node' ? 'edge' : $event.environment.resource_name, + $event.computational_resources ? $event.computational_resources.computational_name : null ).subscribe( () => this.buildGrid(), error => this.toastr.error('Environment management failed!', 'Oops!')); @@ -92,7 +96,7 @@ export class ManagementComponent implements OnInit { this.getActiveUsersList().subscribe(usersList => { this.getTotalBudgetData().subscribe( total => { - const dialogRef = this.dialog.open(ManageEnvironmentComponent, { data: { usersList, total }, panelClass: 'modal-xl-s'}); + const dialogRef = this.dialog.open(ManageEnvironmentComponent, { data: { usersList, total }, panelClass: 'modal-xl-s' }); dialogRef.componentInstance.manageEnv.subscribe((data) => this.manageEnvironment(data)); dialogRef.afterClosed().subscribe(result => result && this.setBudgetLimits(result)); }, () => this.toastr.error('Failed users list loading!', 'Oops!')); @@ -104,14 +108,14 @@ export class ManagementComponent implements OnInit { } isEnvironmentsInProgress(data): boolean { - return data.exploratory.some(el => { + return data.some(el => { return el.status === 'creating' || el.status === 'starting' || el.computational_resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring'); }); } isNotebookInProgress(data): boolean { - return data.exploratory.some(el => el.status === 'creating'); + return data.some(el => el.status === 'creating'); } setBudgetLimits($event) { @@ -144,36 +148,24 @@ export class ManagementComponent implements OnInit { private getExploratoryList() { this.userResourceService.getUserProvisionedResources() .subscribe((result) => { + debugger; this.anyEnvInProgress = this.isEnvironmentsInProgress(result); this.notebookInProgress = this.isNotebookInProgress(result); }); } - private getAllEnvironmentData() { - this.manageEnvironmentsService - .getAllEnvironmentData() - .subscribe((result: Array) => this.allEnvironmentData = this.loadEnvironmentList(result)); - } - - private loadEnvironmentList(data): Array { - if (data) - return data.map(value => new EnvironmentModel( - value.resource_name || value.resource_type, - value.status, - value.shape, - value.computational_resources, - value.user, - value.public_ip, - value.resource_type - )); - } + // private getAllEnvironmentData() { + // this.manageEnvironmentsService + // .getAllEnvironmentData() + // .subscribe((result: Array) => this.allEnvironmentData = result); + // } private getEnvironmentHealthStatus() { this.healthStatusService .getEnvironmentStatuses() .subscribe((status: GeneralEnvironmentStatus) => { this.healthStatus = status; - this.healthStatus.admin && this.getAllEnvironmentData(); + // this.healthStatus.admin && this.getAllEnvironmentData(); this.getExploratoryList(); }); } From b349d54a7d4ccc9bdc30b1970ce9690c4d18549a Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 9 Jul 2019 13:27:57 +0300 Subject: [PATCH 312/357] [DLAB-834]: stop edge node confirmation fixes --- .../management-grid/management-grid.component.html | 1 - .../app/administration/management/management.component.ts | 7 ------- .../confirmation-dialog/confirmation-dialog.model.ts | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index 7933342349..ff152257ab 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -117,7 +117,6 @@ - LOADING To start working, please, create new environment diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index abcf6e31f2..a123e2f7ca 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -154,18 +154,11 @@ export class ManagementComponent implements OnInit { }); } - // private getAllEnvironmentData() { - // this.manageEnvironmentsService - // .getAllEnvironmentData() - // .subscribe((result: Array) => this.allEnvironmentData = result); - // } - private getEnvironmentHealthStatus() { this.healthStatusService .getEnvironmentStatuses() .subscribe((status: GeneralEnvironmentStatus) => { this.healthStatus = status; - // this.healthStatus.admin && this.getAllEnvironmentData(); this.getExploratoryList(); }); } diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts index 7a8e093927..5b05247d6a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts @@ -61,7 +61,7 @@ export class ConfirmationDialogModel { && resources[i].status.toLowerCase() != 'terminated' && resources[i].status.toLowerCase() != 'terminating' && resources[i].status.toLowerCase() != 'stopped') - return true; + return true; } } @@ -94,7 +94,7 @@ export class ConfirmationDialogModel { const defaultTerminateMessage = 'Notebook server will be terminated.'; const containRunningResourcesTerminateMessage = 'Notebook server and all computational resources will be terminated.'; - const edgeNodeStopMessage = 'Edge node will be stopped. You will need to start it later to proceed working with DLAB.'; + const edgeNodeStopMessage = 'Edge node will be stopped. You will need to start it later to proceed working with project.'; switch (confirmationType) { case ConfirmationDialogType.StopExploratory: { From 05e7046f2856eec933cb06e57eb70676a04e05e1 Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 9 Jul 2019 17:01:07 +0300 Subject: [PATCH 313/357] DLAB-000 fixed bug connected with project deletion --- .../dlab/backendapi/service/impl/ProjectServiceImpl.java | 2 +- .../main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 ++ .../java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java | 5 +++++ .../com/epam/dlab/backendapi/service/ProjectService.java | 4 ++++ .../dlab/backendapi/service/impl/EnvironmentServiceImpl.java | 4 +++- .../dlab/backendapi/service/impl/ProjectServiceImpl.java | 5 +++++ .../backendapi/service/impl/EnvironmentServiceImplTest.java | 4 ++-- 7 files changed, 22 insertions(+), 4 deletions(-) diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 7e53c97cce..9504fadd99 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -65,7 +65,7 @@ private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerActio RunDockerCommand runDockerCommand = new RunDockerCommand() .withInteractive() - .withName(String.join("_", projectName, resourceType)) + .withName(String.join("_", projectName, resourceType, action.toString())) .withVolumeForRootKeys(configuration.getKeyDirectory()) .withVolumeForResponse(configuration.getKeyLoaderDirectory()) .withVolumeForLog(configuration.getDockerLogDirectory(), resourceType) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java index 7624bce9c6..b94b2e6fdb 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java @@ -12,6 +12,8 @@ public interface ProjectDAO { List getProjects(); + List getProjectsWithStatus(ProjectDTO.Status status); + List getUserProjectsWithStatus(UserInfo userInfo, ProjectDTO.Status status); void create(ProjectDTO projectDTO); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java index 059d08e63b..013e38cec9 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java @@ -39,6 +39,11 @@ public List getProjects() { return find(PROJECTS_COLLECTION, ProjectDTO.class); } + @Override + public List getProjectsWithStatus(ProjectDTO.Status status) { + return find(PROJECTS_COLLECTION, eq(STATUS_FIELD, status.toString()), ProjectDTO.class); + } + @Override public List getUserProjectsWithStatus(UserInfo userInfo, ProjectDTO.Status status) { return find(PROJECTS_COLLECTION, and(in(GROUPS, Sets.union(userGroupDao.getUserGroups(userInfo.getName()), diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java index 250aca3bb3..27451bc542 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java @@ -11,12 +11,16 @@ public interface ProjectService { List getUserProjects(UserInfo userInfo); + List getProjectsWithStatus(ProjectDTO.Status status); + void create(UserInfo userInfo, ProjectDTO projectDTO); ProjectDTO get(String name); void terminate(UserInfo userInfo, String name); + void start(UserInfo userInfo, String name); + void stop(UserInfo userInfo, String name); void update(UpdateProjectDTO projectDTO); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java index 300b41f6e8..1a68cd1ba8 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java @@ -98,7 +98,9 @@ public Set getUserNames() { public List getAllEnv() { log.debug("Getting all user's environment..."); List expList = exploratoryDAO.getInstances(); - return projectService.getProjects().stream().map(projectDTO -> getProjectEnv(projectDTO, expList)).flatMap(Collection::stream) + return projectService.getProjectsWithStatus(ProjectDTO.Status.ACTIVE) + .stream() + .map(projectDTO -> getProjectEnv(projectDTO, expList)).flatMap(Collection::stream) .collect(toList()); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 23d0e9f074..c43b9a4490 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -60,6 +60,11 @@ public List getUserProjects(UserInfo userInfo) { return projectDAO.getUserProjectsWithStatus(userInfo, ProjectDTO.Status.ACTIVE); } + @Override + public List getProjectsWithStatus(ProjectDTO.Status status) { + return projectDAO.getProjectsWithStatus(status); + } + @Override public void create(UserInfo user, ProjectDTO projectDTO) { if (!projectDAO.get(projectDTO.getName()).isPresent()) { diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java index 2c6a2b6687..5d637247fa 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java @@ -145,7 +145,7 @@ public void getAllEnv() { "key", "tag", null); project.setEdgeInfo(new EdgeInfo()); when(exploratoryDAO.getInstances()).thenReturn(instances); - doReturn(Collections.singletonList(project)).when(projectService).getProjects(); + doReturn(Collections.singletonList(project)).when(projectService).getProjectsWithStatus(ProjectDTO.Status.ACTIVE); EdgeInfo edgeInfo = new EdgeInfo(); edgeInfo.setEdgeStatus("running"); @@ -168,7 +168,7 @@ public void getAllEnv() { assertEquals(3, actualEnv.size()); verify(exploratoryDAO).getInstances(); - verify(projectService).getProjects(); + verify(projectService).getProjectsWithStatus(ProjectDTO.Status.ACTIVE); verifyNoMoreInteractions(exploratoryDAO, envDAO, keyDAO); } From 7ac94bde1044c692064a7142ef576e86955d3b1b Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 10 Jul 2019 10:44:07 +0300 Subject: [PATCH 314/357] aws project tags fixes (test) --- .../general/scripts/aws/common_prepare_notebook.py | 10 ++++++++++ .../src/general/scripts/aws/edge_configure.py | 2 +- .../src/general/scripts/aws/project_prepare.py | 14 ++++---------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py index 72ddb8afd5..ef18efa343 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py @@ -96,6 +96,16 @@ data = {"notebook_name": notebook_config['instance_name'], "error": ""} json.dump(data, f) + print(os.environ['tags']) + + try: + os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + notebook_config['additiona_tags'] + except KeyError: + os.environ['conf_additional_tags'] = notebook_config['additiona_tags'] + + print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) + + # launching instance for notebook server try: logging.info('[CREATE NOTEBOOK INSTANCE]') diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index 294a27e13a..f167985bdc 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -246,7 +246,7 @@ "notebook_subnet": edge_conf['private_subnet_cidr'], "full_edge_conf": edge_conf, "project_name": os.environ['project_name'], - "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp" + "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp", "Action": "Create new EDGE server"} print(json.dumps(res)) result.write(json.dumps(res)) diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py index 0e5edd3af5..b25145b618 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py @@ -114,11 +114,10 @@ logging.info(json.dumps(project_conf)) try: - os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + ';project_tag:{}'.format( - project_conf['project_tag'] + ';project_name:{}'.format( - project_conf['project_name']) + os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + ';project_tag:{0};project_name:{1}'.format( + project_conf['project_tag'], project_conf['project_name']) except KeyError: - os.environ['conf_additional_tags'] = 'project_tag:{0}; project_name:{1}'.format(project_conf['project_tag'], + os.environ['conf_additional_tags'] = 'project_tag:{0};project_name:{1}'.format(project_conf['project_tag'], project_conf['project_name']) print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) @@ -150,12 +149,9 @@ tag = {"Key": project_conf['tag_name'], "Value": "{0}-{1}-subnet".format(project_conf['service_base_name'], project_conf['project_name'])} project_conf['private_subnet_cidr'] = get_subnet_by_tag(tag) -# project_tag = {"Key": 'project_tag', "Value": project_conf['project_tag']} -# project_name = {"Key": 'project_name', "Value": project_conf['project_name']} subnet_id = get_subnet_by_cidr(project_conf['private_subnet_cidr']) print('subnet id: {}'.format(subnet_id)) -# create_tag(subnet_id, project_tag) -# create_tag(subnet_id, project_name) + print('NEW SUBNET CIDR CREATED: {}'.format(project_conf['private_subnet_cidr'])) try: @@ -547,8 +543,6 @@ try: local("~/scripts/{}.py {}".format('common_create_instance', params)) edge_instance = get_instance_by_name(project_conf['tag_name'], project_conf['edge_instance_name']) -# create_tag(edge_instance, project_tag) -# create_tag(edge_instance, project_name) except: traceback.print_exc() raise Exception From 9dc47a55bc97a5b0d9a7e149fa902bee02a45dd4 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 10 Jul 2019 10:45:41 +0300 Subject: [PATCH 315/357] aws project tags fixes (test) --- .../src/general/scripts/aws/common_prepare_notebook.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py index ef18efa343..7a19a72c25 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py @@ -97,11 +97,12 @@ json.dump(data, f) print(os.environ['tags']) - + tegy = json.dumps(os.environ['tags']) + print(tegy) try: - os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + notebook_config['additiona_tags'] + os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + tegy except KeyError: - os.environ['conf_additional_tags'] = notebook_config['additiona_tags'] + os.environ['conf_additional_tags'] = tegy print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) From 3d3a28118787bc95d5619205947f8b6899c2ac8c Mon Sep 17 00:00:00 2001 From: Oleh Martushevskyi Date: Wed, 10 Jul 2019 15:43:21 +0300 Subject: [PATCH 316/357] [DLAB-176]: Fixed issue with install devtools R package --- .../src/general/lib/os/redhat/common_lib.py | 2 +- .../src/general/lib/os/redhat/notebook_lib.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py index 316f792630..12d2116f36 100644 --- a/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py @@ -27,7 +27,7 @@ import os -def ensure_pkg(user, requisites='git vim gcc python-devel openssl-devel nmap libffi libffi-devel unzip'): +def ensure_pkg(user, requisites='git vim gcc python-devel openssl-devel nmap libffi libffi-devel unzip libxml2-devel'): try: if not exists('/home/{}/.ensure_dir/pkg_upgraded'.format(user)): print("Updating repositories and installing requested tools: {}".format(requisites)) diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py index a103d26514..ef0c4bad60 100644 --- a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py @@ -218,7 +218,7 @@ def ensure_python2_libraries(os_user): try: sudo('pip2 install pyparsing==2.0.3') sudo('yum install -y python-setuptools python-wheel') - sudo('yum install -y python-virtualenv openssl-devel python-devel openssl-libs libxml2-devel libxslt-devel --nogpgcheck') + sudo('yum install -y python-virtualenv openssl-devel python-devel openssl-libs libxslt-devel --nogpgcheck') try: sudo('python2 -m pip install backports.shutil_get_terminal_size tornado=={0} ipython ipykernel=={1} --no-cache-dir' \ .format(os.environ['notebook_tornado_version'], os.environ['notebook_ipykernel_version'])) From c343bd259a34aed35d11f7ec783cd2e1f2cc4a64 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 10 Jul 2019 18:25:19 +0300 Subject: [PATCH 317/357] [DLAB-834]: cleanup management view --- .../management/backup-dilog/backup-dilog.component.ts | 3 +-- .../management/management-grid/management-grid.component.ts | 4 +--- .../src/app/administration/management/management.component.ts | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts index feaf25fae4..0bcee959bc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts @@ -75,7 +75,7 @@ export class BackupDilogComponent implements OnInit { if (this.backupOptions[el] instanceof Array) { if (this.backupOptions[el][0] && this.backupOptions[el][0] !== 'skip') items.push(this.backupOptions[el][0]); } else { - if (this.backupOptions[el]) items.push(this.backupOptions[el]) ; + if (this.backupOptions[el]) items.push(this.backupOptions[el]); } }); @@ -83,7 +83,6 @@ export class BackupDilogComponent implements OnInit { } private getBackupStatus(result) { - debugger; const uuid = result.body; this.backupService.getBackupStatus(uuid) .subscribe((backupStatus: any) => { diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts index 3e965dc91c..e717e9be79 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts @@ -37,13 +37,11 @@ export interface ManageAction { templateUrl: 'management-grid.component.html', styleUrls: [ './management-grid.component.scss', - '../../../resources/resources-grid/resources-grid.component.css', + '../../../resources/resources-grid/resources-grid.component.scss', '../../../resources/computational/computational-resources-list/computational-resources-list.component.scss' ] }) export class ManagementGridComponent implements OnInit { - // @Input() allEnvironmentData: Array; - allEnvironmentData: Array; loading: boolean = false; diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index a123e2f7ca..c737bdbc09 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -148,7 +148,6 @@ export class ManagementComponent implements OnInit { private getExploratoryList() { this.userResourceService.getUserProvisionedResources() .subscribe((result) => { - debugger; this.anyEnvInProgress = this.isEnvironmentsInProgress(result); this.notebookInProgress = this.isNotebookInProgress(result); }); From 40e800b9da83ccc3195d87c08872147afc2d87c9 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 10 Jul 2019 18:26:47 +0300 Subject: [PATCH 318/357] [DLAB-834]: resource grid styles format changed --- .../administration/roles/roles.component.ts | 2 +- .../reporting-grid.component.ts | 2 +- .../resources-grid.component.scss | 315 ++++++++++++++++++ 3 files changed, 317 insertions(+), 2 deletions(-) create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts index eb5d9028f9..58d471128a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts @@ -29,7 +29,7 @@ import { DICTIONARY } from '../../../dictionary/global.dictionary'; @Component({ selector: 'dlab-roles', templateUrl: './roles.component.html', - styleUrls: ['../../resources/resources-grid/resources-grid.component.css', './roles.component.scss'] + styleUrls: ['../../resources/resources-grid/resources-grid.component.scss', './roles.component.scss'] }) export class RolesComponent implements OnInit { readonly DICTIONARY = DICTIONARY; diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts index c65e01f8ca..edc9d41323 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts @@ -25,7 +25,7 @@ import { DICTIONARY, ReportingConfigModel } from '../../../dictionary/global.dic selector: 'dlab-reporting-grid', templateUrl: './reporting-grid.component.html', styleUrls: ['./reporting-grid.component.scss', - '../../resources/resources-grid/resources-grid.component.css'] + '../../resources/resources-grid/resources-grid.component.scss'] }) export class ReportingGridComponent implements OnInit { readonly DICTIONARY = DICTIONARY; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss new file mode 100644 index 0000000000..6d4216903e --- /dev/null +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss @@ -0,0 +1,315 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.data-table { + width: 100%; +} + +table { + width: 100%; + + .exploratory { + padding: 0; + + tbody { + width: 100%; + display: inline-table; + + tr:not(:last-child) { + border-bottom: 1px solid #d9d9d9; + } + } + } + + .name-col { + width: 20%; + padding-left: 24px; + } + + .status-col { + width: 16%; + } + + .shape-col { + width: 16%; + } + + .resources-col { + width: 30%; + } + + .cost-col { + width: 10%; + text-align: center; + } + + .actions-col { + width: 8%; + padding-right: 24px; + text-align: right; + } +} + +tr.detail-row { + height: 0; +} + +tr.element-row:not(.expanded-row):hover { + // background: #777; +} + +tr.element-row:not(.expanded-row):active { + background: #efefef; +} + +.element-row td { + border-bottom-width: 0; +} + + +.element-diagram { + min-width: 80px; + border: 2px solid black; + padding: 8px; + font-weight: lighter; + margin: 8px 0; + height: 104px; +} + +.element-symbol { + font-weight: bold; + font-size: 40px; + line-height: normal; +} + +.element-description { + padding: 16px; +} + +.element-description-attribution { + opacity: 0.5; +} + + + +.dashboard_table { + width: 100%; + table-layout: fixed; +} + + + +.dashboard_table tr { + vertical-align: top; +} + +.dashboard_table tr th span { + width: 50px; + text-align: center; + height: 100%; + line-height: 40px; +} + +.dashboard_table tr td { + font-size: 14px; + padding: 20px 15px 16px; +} + +.dashboard_table tr td, +.dashboard_table tr th { + border: 1px solid #d5dfea; + text-align: left; +} + +.dashboard_table tr td:last-child { + text-align: center; +} + +.dashboard_table_body td:first-child { + background: #f3fbfd; + color: #455c74; + font-weight: 600; + font-size: 16px; + cursor: pointer; + overflow: hidden; + text-overflow: ellipsis; +} + +.dashboard_table tr:nth-child(2n + 1) { + background: #f9fafb; +} + +.dashboard_table tr.filter-row td { + padding: 10px; +} + +.dashboard_table tr.filter-row td:first-child { + font-weight: 400; +} + +.dashboard_table tr.filter-row td:last-child { + padding: 10px 0; +} + +.filter-row .actions { + text-align: center; +} + +.filter-row .actions button { + background: #fff; + border-color: #35afd5; + color: #35afd5; + outline: none; +} + +.filter-row .actions .reset:hover { + border-color: #f1696e; + background: #f9fafb; + color: #f1696e; +} + +.filter-row .actions .apply:hover { + border-color: #49af38; + background: #f9fafb; + color: #49af38; +} + +.dashboard_table tr:nth-child(2n + 1) td:first-child { + background: #edf6f9; +} + +.dashboard_table th { + background: #a1b7d1; + color: #fff; + font-weight: 600; + line-height: 40px; + text-transform: uppercase; + padding-left: 12px; + font-size: 12px; +} + +.data-grid .status { + text-transform: capitalize; +} + +.data-grid .list-menu { + left: auto; + margin-left: 0; + right: 15px; + padding: 10px 15px; + box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), + 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12); + border: none; + min-width: 190px; +} + +.settings { + position: relative; +} + +.settings .disabled { + opacity: 0.4; + cursor: not-allowed; + pointer-events: none; +} + +.settings .actions { + background-image: url(../../../assets/svg/settings_icon.svg); + width: 16px; + height: 16px; + display: inline-block; + text-align: center; + /* margin-top: 2px; */ + cursor: pointer; +} + +.data-grid .list-menu li { + font-size: 14px; + border-bottom: 1px solid #edf1f5; + padding: 8px 15px; + cursor: pointer; + margin: 5px -5px; + color: #577289; + transition: all 0.45s ease-in-out; +} + +.data-grid .list-menu a.navigate { + text-decoration: none; + color: #577289; + transition: all 0.45s ease-in-out; +} + +.data-grid .list-menu li i { + font-size: 18px; + padding-right: 5px; + vertical-align: bottom; +} + +.data-grid .list-menu li:hover, +.data-grid .list-menu li:hover a { + background: none !important; + color: #36afd5; +} + +.data-grid .list-menu li:last-child { + border-bottom: 0; +} + +.data-grid .list-menu ul { + margin-bottom: 0; +} + +.data-grid .list-menu .active-items li { + border-bottom: 1px solid #edf1f5; +} + +.data-grid .message_block { + background: #edf6f9; +} + +.message_block td { + text-align: left !important; +} + +.data-grid .total_cost { + display: inline-block; + width: 70%; + color: #455c74; +} + +.currency_details { + float: right; + color: #35afd5; + cursor: pointer; + transition: all 0.45s ease-in-out; +} + +.currency_details:hover { + color: #3392b0; +} + +.currency_details .material-icons { + font-size: 18px; +} + +.mat-icon-button .mat-icon, +.mat-icon-button i { + line-height: 42px; + font-size: 18px; +} From 3c9bea874df5deda5a2e5a5f29e750a368db230c Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 10 Jul 2019 18:51:13 +0300 Subject: [PATCH 319/357] [DLAB-866]: changed exploratory model format --- .../resources-grid/resources-grid.model.ts | 70 +++++++++++-------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts index f1c83f31a1..72317c0bc7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts @@ -51,38 +51,46 @@ export class ExploratoryModel { public tags: any, ) { } - public static loadEnvironments(exploratoryList: Array, sharedDataList: any): Array { - if (exploratoryList && sharedDataList) { - return exploratoryList.map((value) => { - return new ExploratoryModel(value.exploratory_name, - value.template_name, - value.image, - value.status, - value.shape, - value.computational_resources, - value.up_time, - value.exploratory_url, - sharedDataList.edge_node_ip, - value.private_ip, - value.exploratory_user, - value.exploratory_pass, - sharedDataList[DICTIONARY.bucket_name], - sharedDataList[DICTIONARY.shared_bucket_name], - value.error_message, - value[DICTIONARY.billing.cost], - value[DICTIONARY.billing.currencyCode], - value.billing, - value.libs, - sharedDataList[DICTIONARY.user_storage_account_name], - sharedDataList[DICTIONARY.shared_storage_account_name], - sharedDataList[DICTIONARY.datalake_name], - sharedDataList[DICTIONARY.datalake_user_directory_name], - sharedDataList[DICTIONARY.datalake_shared_directory_name], - value.project, - value.endpoint, - value.tags - ); + public static loadEnvironments(data: Array) { + if (data) { + return data.map((value) => { + return { + project: value.project, + exploratory: value.exploratory.map(el => new ExploratoryModel(el.exploratory_name, + el.template_name, + el.image, + el.status, + el.shape, + el.computational_resources, + el.up_time, + el.exploratory_url, + value.shared.edge_node_ip, + el.private_ip, + el.exploratory_user, + el.exploratory_pass, + value.shared[DICTIONARY.bucket_name], + value.shared[DICTIONARY.shared_bucket_name], + el.error_message, + el[DICTIONARY.billing.cost], + el[DICTIONARY.billing.currencyCode], + el.billing, + el.libs, + value.shared[DICTIONARY.user_storage_account_name], + value.shared[DICTIONARY.shared_storage_account_name], + value.shared[DICTIONARY.datalake_name], + value.shared[DICTIONARY.datalake_user_directory_name], + value.shared[DICTIONARY.datalake_shared_directory_name], + el.project, + el.endpoint, + el.tags + )) + } }); } } } + +export interface Exploratory { + project: string; + exploratory: ExploratoryModel[] +} \ No newline at end of file From 15b115fa01d6971876e06d5fc24095ecdd928a34 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 10 Jul 2019 18:52:13 +0300 Subject: [PATCH 320/357] [DLAB-866]: rebuild data grid with project top level --- .../resources-grid.component.css | 242 ---------- .../resources-grid.component.html | 423 ++++++++++++------ .../resources-grid.component.ts | 188 ++++---- 3 files changed, 392 insertions(+), 461 deletions(-) delete mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css deleted file mode 100644 index f013f2dcfa..0000000000 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -.dashboard_table { - width: 100%; - table-layout: fixed; -} - -.dashboard_table .th_status { - width: 16%; -} - -.dashboard_table .th_shape { - width: 17%; -} - -.dashboard_table .th_resources { - width: 32%; -} - -.dashboard_table .th_cost { - width: 10%; -} - -.dashboard_table .th_actions { - width: 8%; -} - -.dashboard_table tr { - vertical-align: top; -} - -.dashboard_table tr th span { - width: 50px; - text-align: center; - height: 100%; - line-height: 40px; -} - -.dashboard_table tr td { - font-size: 14px; - padding: 20px 15px 16px; -} - -.dashboard_table tr td, -.dashboard_table tr th { - border: 1px solid #d5dfea; - text-align: left; -} - -.dashboard_table tr td:last-child { - text-align: center; -} - -.dashboard_table_body td:first-child { - background: #f3fbfd; - color: #455c74; - font-weight: 600; - font-size: 16px; - cursor: pointer; - overflow: hidden; - text-overflow: ellipsis; -} - -.dashboard_table tr:nth-child(2n + 1) { - background: #f9fafb; -} - -.dashboard_table tr.filter-row td { - padding: 10px; -} - -.dashboard_table tr.filter-row td:first-child { - font-weight: 400; -} - -.dashboard_table tr.filter-row td:last-child { - padding: 10px 0; -} - -.filter-row .actions { - text-align: center; -} - -.filter-row .actions button { - background: #fff; - border-color: #35afd5; - color: #35afd5; - outline: none; -} - -.filter-row .actions .reset:hover { - border-color: #f1696e; - background: #f9fafb; - color: #f1696e; -} - -.filter-row .actions .apply:hover { - border-color: #49af38; - background: #f9fafb; - color: #49af38; -} - -.dashboard_table tr:nth-child(2n + 1) td:first-child { - background: #edf6f9; -} - -.dashboard_table th { - background: #a1b7d1; - color: #fff; - font-weight: 600; - line-height: 40px; - text-transform: uppercase; - padding-left: 12px; - font-size: 12px; -} - -.data-grid .status { - text-transform: capitalize; -} - -.data-grid .list-menu { - left: auto; - margin-left: 0; - right: 15px; - padding: 10px 15px; - box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), - 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12); - border: none; - min-width: 190px; -} - -.settings { - position: relative; -} - -.settings .disabled { - opacity: 0.4; - cursor: not-allowed; - pointer-events: none; -} - -.settings .actions { - background-image: url(../../../assets/svg/settings_icon.svg); - width: 16px; - height: 16px; - display: inline-block; - text-align: center; - margin-top: 2px; - cursor: pointer; -} - -.data-grid .list-menu li { - font-size: 14px; - border-bottom: 1px solid #edf1f5; - padding: 8px 15px; - cursor: pointer; - margin: 5px -5px; - color: #577289; - transition: all 0.45s ease-in-out; -} - -.data-grid .list-menu a.navigate { - text-decoration: none; - color: #577289; - transition: all 0.45s ease-in-out; -} - -.data-grid .list-menu li i { - font-size: 18px; - padding-right: 5px; - vertical-align: bottom; -} - -.data-grid .list-menu li:hover, -.data-grid .list-menu li:hover a { - background: none !important; - color: #36afd5; -} - -.data-grid .list-menu li:last-child { - border-bottom: 0; -} - -.data-grid .list-menu ul { - margin-bottom: 0; -} - -.data-grid .list-menu .active-items li { - border-bottom: 1px solid #edf1f5; -} - -.data-grid .message_block { - background: #edf6f9; -} - -.message_block td { - text-align: left !important; -} - -.data-grid .total_cost { - display: inline-block; - width: 70%; - color: #455c74; -} - -.currency_details { - float: right; - color: #35afd5; - cursor: pointer; - transition: all 0.45s ease-in-out; -} - -.currency_details:hover { - color: #3392b0; -} - -.currency_details .material-icons { - font-size: 18px; -} - -.mat-icon-button .mat-icon, -.mat-icon-button i { - line-height: 42px; - font-size: 18px; -} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index ec7d522c90..feba6d0f10 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -17,148 +17,295 @@ ~ under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -80,7 +80,7 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + -
    - {{column.title}} - -
    - - - - - - - - -
    - - - -
    -
    To start - working, please, create new environment
    No matches - found
    {{env.name}}{{ env.status | underscoreless }}{{env.shape}} - - - - {{ env.cost || 'N/A' }} {{ env.currency_code || '' }} - - help_outline - - - - - - -
      -
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {{ element.project }} {{ column.title }} + + +
      {{ element.name }} + {{element.status | underscoreless }} + {{ element.shape }} + + + + {{ element.cost || 'N/A' }} {{ element.currency_code || '' }} + + help_outline + + + + + + +
        +
        +
      • +
        + pause_circle_outline + Stop +
        +
        • +
      • +
        + play_circle_outline + Run +
        +
        • +
      • +
        + phonelink_off + Terminate +
        +
        • +
      • + memory + Add compute +
        • +
      • + schedule + Scheduler +
        • +
        +
      • + view_module + Create {{ DICTIONARY.image }} +
        • +
      • + developer_board + Manage libraries +
        • +
      • + + laptop + Open terminal + +
        • +
      +       +
      + + + + + + + + + + + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index fc2eaf09ca..881f74bf16 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -19,12 +19,13 @@ /* tslint:disable:no-empty */ import { Component, OnInit } from '@angular/core'; +import { animate, state, style, transition, trigger } from '@angular/animations'; import { ToastrService } from 'ngx-toastr'; import { MatDialog } from '@angular/material'; import { UserResourceService } from '../../core/services'; -import { ExploratoryModel } from './resources-grid.model'; +import { ExploratoryModel, Exploratory } from './resources-grid.model'; import { FilterConfigurationModel } from './filter-configuration.model'; import { GeneralEnvironmentStatus } from '../../administration/management/management.model'; import { ConfirmationDialogType } from '../../shared'; @@ -42,14 +43,29 @@ import { DICTIONARY } from '../../../dictionary/global.dictionary'; @Component({ selector: 'resources-grid', templateUrl: 'resources-grid.component.html', - styleUrls: ['./resources-grid.component.css'] + styleUrls: ['./resources-grid.component.scss'], + animations: [ + trigger('detailExpand', [ + state('collapsed', style({ height: '0px', minHeight: '0' })), + state('expanded', style({ height: '*' })), + transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')), + ]), + ], }) export class ResourcesGridComponent implements OnInit { readonly DICTIONARY = DICTIONARY; - environments: Array; - filteredEnvironments: Array = []; + // displayedColumns: string[] = ['name', 'status', 'shape', 'resources', 'cost', 'actions']; + displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions']; + + environments: Exploratory[]; + forse: boolean = true; + + + + + filteredEnvironments: Exploratory[] = []; filterConfiguration: FilterConfigurationModel; filterForm: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); @@ -60,45 +76,63 @@ export class ResourcesGridComponent implements OnInit { healthStatus: GeneralEnvironmentStatus; public filteringColumns: Array = [ - { title: 'Environment name', name: 'name', className: 'th_name', filtering: {} }, - { title: 'Status', name: 'statuses', className: 'th_status', filtering: {} }, - { title: DICTIONARY.instance_size, name: 'shapes', className: 'th_shape', filtering: {} }, - { title: DICTIONARY.computational_resource, name: 'resources', className: 'th_resources', filtering: {} }, - { title: 'Cost', name: 'cost', className: 'th_cost' }, - { title: 'Actions', className: 'th_actions' } + { title: 'Environment name', name: 'name', class: 'name-col', filtering: {} }, + { title: 'Status', name: 'statuses', class: 'status-col', filtering: {} }, + { title: DICTIONARY.instance_size, name: 'shapes', class: 'shape-col', filtering: {} }, + { title: DICTIONARY.computational_resource, name: 'resources', class: 'resources-col', filtering: {} }, + { title: 'Cost', name: 'cost', class: 'cost-col' }, + { title: '', name: 'actions', class: 'actions-col' } ]; + displayedColumns: string[] = this.filteringColumns.map(item => item.name); + constructor( public toastr: ToastrService, private userResourceService: UserResourceService, private dialog: MatDialog - ) {} + ) { } ngOnInit(): void { this.buildGrid(); + debugger; + } + + public buildGrid(): void { + this.userResourceService.getUserProvisionedResources() + .subscribe((result: any) => { + this.environments = ExploratoryModel.loadEnvironments(result); + this.getDefaultFilterConfiguration(); + (this.environments.length) ? this.getUserPreferences() : this.filteredEnvironments = []; + }); } + + + + + + toggleFilterRow(): void { this.collapseFilterRow = !this.collapseFilterRow; } getDefaultFilterConfiguration(): void { - const data: Array = this.environments; + // const data: Exploratory[] = this.environments; const shapes = [], statuses = [], resources = []; - data.forEach((item: any) => { - if (shapes.indexOf(item.shape) === -1) - shapes.push(item.shape); - if (statuses.indexOf(item.status) === -1) - statuses.push(item.status); - statuses.sort(SortUtil.statusSort); - - item.resources.forEach((resource: any) => { - if (resources.indexOf(resource.status) === -1) - resources.push(resource.status); - resources.sort(SortUtil.statusSort); - }); - }); + // data.forEach((item: any) => { + // if (shapes.indexOf(item.shape) === -1) + // shapes.push(item.shape); + // if (statuses.indexOf(item.status) === -1) + // statuses.push(item.status); + // statuses.sort(SortUtil.statusSort); + + // item.resources.forEach((resource: any) => { + // if (resources.indexOf(resource.status) === -1) + // resources.push(resource.status); + // resources.sort(SortUtil.statusSort); + // }); + // }); this.filterConfiguration = new FilterConfigurationModel('', statuses, shapes, resources, ''); } @@ -106,29 +140,29 @@ export class ResourcesGridComponent implements OnInit { applyFilter_btnClick(config: FilterConfigurationModel) { this.filtering = true; - // let filteredData: Array = this.environments.map(env => (Object).assign({}, env)); - let filteredData: Array = this.environments.map(env => (Object).create(env)); - const containsStatus = (list, selectedItems) => { - return list.filter((item: any) => { if (selectedItems.indexOf(item.status) !== -1) return item; }); - }; + let filteredData: Exploratory[] = this.environments.map(env => (Object).assign({}, env)); + // let filteredData: any = this.environments.map(env => (Object).create(env)); + // const containsStatus = (list, selectedItems) => { + // return list.filter((item: any) => { if (selectedItems.indexOf(item.status) !== -1) return item; }); + // }; - config && (filteredData = filteredData.filter((item: any) => { - const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1; - const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active'); - const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true; + // config && (filteredData = filteredData.filter((item: any) => { + // const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1; + // const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active'); + // const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true; - const modifiedResources = containsStatus(item.resources, config.resources); - let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true; + // const modifiedResources = containsStatus(item.resources, config.resources); + // let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true; - if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; } - if (config.resources.length === 0 && config.type === 'active' || - modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') { - item.resources = modifiedResources; - isResources = true; - } + // if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; } + // if (config.resources.length === 0 && config.type === 'active' || + // modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') { + // item.resources = modifiedResources; + // isResources = true; + // } - return isName && isStatus && isShape && isResources; - })); + // return isName && isStatus && isShape && isResources; + // })); config && this.updateUserPreferences(config); this.filteredEnvironments = filteredData; @@ -141,15 +175,15 @@ export class ResourcesGridComponent implements OnInit { } isResourcesInProgress(notebook) { - const filteredEnv: any = this.environments.find(env => env.name === notebook.name); - - if (filteredEnv && filteredEnv.resources.length) { - return filteredEnv.resources.filter(resource => ( - resource.status !== 'failed' - && resource.status !== 'terminated' - && resource.status !== 'running' - && resource.status !== 'stopped')).length > 0; - } + // const filteredEnv = this.environments.find(env => env.exploratory.find(el => el.name === notebook.name)); + + // if (filteredEnv && filteredEnv.resources.length) { + // return filteredEnv.resources.filter(resource => ( + // resource.status !== 'failed' + // && resource.status !== 'terminated' + // && resource.status !== 'running' + // && resource.status !== 'stopped')).length > 0; + // } return false; } @@ -171,7 +205,7 @@ export class ResourcesGridComponent implements OnInit { aliveStatuses(сonfig): void { for (const index in this.filterConfiguration) { if (сonfig[index] && сonfig[index] instanceof Array) - сonfig[index] = сonfig[index].filter(item => this.filterConfiguration[index].includes(item)); + сonfig[index] = сonfig[index].filter(item => this.filterConfiguration[index].includes(item)); } return сonfig; @@ -195,21 +229,13 @@ export class ResourcesGridComponent implements OnInit { this.buildGrid(); } - buildGrid(): void { - this.userResourceService.getUserProvisionedResources() - .subscribe((result) => { - this.environments = ExploratoryModel.loadEnvironments(result.exploratory, result.shared); - this.getDefaultFilterConfiguration(); - (this.environments.length) ? this.getUserPreferences() : this.filteredEnvironments = []; - }); - } containsNotebook(notebook_name: string): boolean { - if (notebook_name) - for (let index = 0; index < this.environments.length; index++) - if (CheckUtils.delimitersFiltering(notebook_name) === CheckUtils.delimitersFiltering(this.environments[index].name)) - return true; + // if (notebook_name) + // for (let index = 0; index < this.environments.length; index++) + // if (CheckUtils.delimitersFiltering(notebook_name) === CheckUtils.delimitersFiltering(this.environments[index].name)) + // return true; return false; } @@ -232,25 +258,25 @@ export class ResourcesGridComponent implements OnInit { updateUserPreferences(filterConfiguration: FilterConfigurationModel): void { this.userResourceService.updateUserPreferences(filterConfiguration) .subscribe((result) => { }, - (error) => { - console.log('UPDATE USER PREFERENCES ERROR ', error); - }); + (error) => { + console.log('UPDATE USER PREFERENCES ERROR ', error); + }); } printDetailEnvironmentModal(data): void { this.dialog.open(DetailDialogComponent, { data: data, panelClass: 'modal-lg' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe(() => this.buildGrid()); } printCostDetails(data): void { this.dialog.open(CostDetailsDialogComponent, { data: data, panelClass: 'modal-xl' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe(() => this.buildGrid()); } exploratoryAction(data, action: string) { if (action === 'deploy') { - this.dialog.open(ComputationalResourceCreateDialogComponent, { data: { notebook: data, full_list: this.environments}, panelClass: 'modal-xxl'}) - .afterClosed().subscribe(() => this.buildGrid()); + this.dialog.open(ComputationalResourceCreateDialogComponent, { data: { notebook: data, full_list: this.environments }, panelClass: 'modal-xxl' }) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'run') { this.userResourceService .runExploratoryEnvironment({ notebook_instance_name: data.name }) @@ -258,20 +284,20 @@ export class ResourcesGridComponent implements OnInit { () => this.buildGrid(), error => this.toastr.error(error.message || 'Exploratory starting failed!', 'Oops!')); } else if (action === 'stop') { - this.dialog.open(ConfirmationDialogComponent, { data: { notebook: data, type: ConfirmationDialogType.StopExploratory }, panelClass: 'modal-sm'}) - .afterClosed().subscribe(() => this.buildGrid()); + this.dialog.open(ConfirmationDialogComponent, { data: { notebook: data, type: ConfirmationDialogType.StopExploratory }, panelClass: 'modal-sm' }) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'terminate') { - this.dialog.open(ConfirmationDialogComponent, {data: { notebook: data, type: ConfirmationDialogType.TerminateExploratory }, panelClass: 'modal-sm'}) - .afterClosed().subscribe(() => this.buildGrid()); + this.dialog.open(ConfirmationDialogComponent, { data: { notebook: data, type: ConfirmationDialogType.TerminateExploratory }, panelClass: 'modal-sm' }) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'install') { this.dialog.open(InstallLibrariesComponent, { data: data, panelClass: 'modal-fullscreen' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'schedule') { - this.dialog.open(SchedulerComponent, { data: {notebook: data, type: 'EXPLORATORY'}, panelClass: 'modal-xl-s' }) - .afterClosed().subscribe(() => this.buildGrid()); + this.dialog.open(SchedulerComponent, { data: { notebook: data, type: 'EXPLORATORY' }, panelClass: 'modal-xl-s' }) + .afterClosed().subscribe(() => this.buildGrid()); } else if (action === 'ami') { this.dialog.open(AmiCreateDialogComponent, { data: data, panelClass: 'modal-sm' }) - .afterClosed().subscribe(() => this.buildGrid()); + .afterClosed().subscribe(() => this.buildGrid()); } } } From b50ad5cb7d2382420cc9906788ced3ccac2106bd Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 10 Jul 2019 18:52:30 +0300 Subject: [PATCH 321/357] [DLAB-866]: rebuild data grid with project top level --- .../app/resources/resources.component.html | 52 ++++++++++--------- .../src/app/resources/resources.component.ts | 4 +- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index c4fdad870c..3020738ee9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -17,29 +17,31 @@ ~ under the License. --> -
      -
      - +
      +
      +
      + +
      +
      + + + +
      -
      - - - -
      -
      - - + + + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts index d59e4a0ee4..4831f99556 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts @@ -24,7 +24,7 @@ import { MatDialog } from '@angular/material'; import { ResourcesGridComponent } from './resources-grid/resources-grid.component'; import { ExploratoryEnvironmentCreateComponent } from './exploratory/create-environment'; -import { ExploratoryModel } from './resources-grid/resources-grid.model'; +import { ExploratoryModel, Exploratory } from './resources-grid/resources-grid.model'; import { HealthStatusService } from '../core/services'; import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; @@ -35,7 +35,7 @@ import { ManageUngitComponent } from './manage-ungit/manage-ungit.component'; }) export class ResourcesComponent implements OnInit { - public exploratoryEnvironments: Array = []; + public exploratoryEnvironments: Exploratory[] = []; public healthStatus: any; @ViewChild(ResourcesGridComponent) resourcesGrid: ResourcesGridComponent; From afc0a009a838729a872b5b7d8ab779121f59a8ac Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Thu, 11 Jul 2019 10:47:51 +0300 Subject: [PATCH 322/357] aws project tags fixed aws user key uploading fixed gcp edge_configure and project prepare fixed --- .../src/general/scripts/aws/common_prepare_notebook.py | 10 +++------- .../src/general/scripts/aws/project_prepare.py | 4 ++++ .../src/general/scripts/gcp/edge_configure.py | 2 +- .../src/general/scripts/gcp/project_prepare.py | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py index 7a19a72c25..a9d74cee94 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py @@ -96,13 +96,10 @@ data = {"notebook_name": notebook_config['instance_name'], "error": ""} json.dump(data, f) - print(os.environ['tags']) - tegy = json.dumps(os.environ['tags']) - print(tegy) try: - os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + tegy + os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{1}'.format(project_conf['project_name']) except KeyError: - os.environ['conf_additional_tags'] = tegy + os.environ['conf_additional_tags'] = os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{1}'.format(project_conf['project_name']) print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) @@ -119,8 +116,7 @@ os.environ['notebook_disk_size'], notebook_config['primary_disk_size']) try: local("~/scripts/{}.py {}".format('common_create_instance', params)) -# notebook_instance = get_instance_by_name(notebook_config['tag_name'], notebook_config['instance_name']) -# create_tag(notebook_instance, os.environ['tag']) + except: traceback.print_exc() raise Exception diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py index b25145b618..b4c7b5fcc2 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py @@ -105,6 +105,10 @@ # FUSE in case of absence of user's key try: project_conf['user_key'] = os.environ['key'] + try: + local('echo "{0}" >> {1}{2}.pub'.format(project_conf['user_key'], os.environ['conf_key_dir'], project_conf['project_name'])) + except: + print("ADMINSs PUBLIC KEY DOES NOT INSTALLED") except KeyError: print("ADMINSs PUBLIC KEY DOES NOT UPLOADED") sys.exit(1) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py index 63a1cdd0c7..ed9c041e9c 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py @@ -62,7 +62,7 @@ edge_conf['project_name']) edge_conf['ps_role_name'] = '{}-{}-ps'.format(edge_conf['service_base_name'], edge_conf['project_name']) - edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf[project_name']) + edge_conf['instance_name'] = '{0}-{1}-edge'.format(edge_conf['service_base_name'], edge_conf['project_name']) edge_conf['firewall_name'] = edge_conf['instance_name'] + '{}-firewall'.format(edge_conf['instance_name']) edge_conf['notebook_firewall_name'] = '{0}-{1}-nb-firewall'.format(edge_conf['service_base_name'], edge_conf['project_name']) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py index a178f8bfea..6d0fcd37f3 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py @@ -98,6 +98,10 @@ # FUSE in case of absence of user's key try: project_conf['user_key'] = os.environ['key'] + try: + local('echo "{0}" >> {1}{2}.pub'.format(project_conf['user_key'], os.environ['conf_key_dir'], project_conf['project_name'])) + except: + print("ADMINSs PUBLIC KEY DOES NOT INSTALLED") except KeyError: print("ADMINSs PUBLIC KEY DOES NOT UPLOADED") sys.exit(1) From 9664bded6dba135466997248a52178b6219c8e7f Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Fri, 12 Jul 2019 09:53:00 +0300 Subject: [PATCH 323/357] project_conf variable in common_prepare_notebook fixed --- .../src/general/scripts/aws/common_prepare_notebook.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py index a9d74cee94..96bf8cd3b5 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py @@ -97,9 +97,9 @@ json.dump(data, f) try: - os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{1}'.format(project_conf['project_name']) + os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{1}'.format(os.environ['project_name']) except KeyError: - os.environ['conf_additional_tags'] = os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{1}'.format(project_conf['project_name']) + os.environ['conf_additional_tags'] = os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{1}'.format(os.environ['project_name']) print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) From 5c1a7c4ec50ccdf9fdb013ea8d6dfae43f778984 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Fri, 12 Jul 2019 09:54:21 +0300 Subject: [PATCH 324/357] project_conf variable in common_prepare_notebook fixed --- .../src/general/scripts/aws/common_prepare_notebook.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py index 96bf8cd3b5..1b8fb42e51 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py @@ -97,9 +97,9 @@ json.dump(data, f) try: - os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{1}'.format(os.environ['project_name']) + os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{}'.format(os.environ['project_name']) except KeyError: - os.environ['conf_additional_tags'] = os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{1}'.format(os.environ['project_name']) + os.environ['conf_additional_tags'] = os.environ['tags'].replace("': u'", ":").replace("', u'", ";").replace("{u'", "" ).replace("'}", "") + ';project_name:{}'.format(os.environ['project_name']) print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags'])) From e6287f240f4f07f39aeb9990a10877116ee458e4 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 12 Jul 2019 11:52:43 +0300 Subject: [PATCH 325/357] [DLAB-866]: replaced url validation --- .../src/main/resources/webapp/src/app/core/util/patterns.ts | 2 +- .../app/resources/resources-grid/resources-grid.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts index f93dae6dd5..7b8f4f269c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts @@ -20,7 +20,7 @@ export const PATTERNS = { namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+', delimitersRegex: '/[-_]?/g', - url: '(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?', + url: '[a-zA-Z0-9.://%#&\\.@:%-_\+~#=]*\.[^\s]*[a-zA-Z0-9]+', nodeCountPattern: '^[1-9]\\d*$', integerRegex: '^[0-9]*$' } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss index 6d4216903e..c40c2cd2c8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss @@ -75,7 +75,7 @@ tr.element-row:not(.expanded-row):hover { } tr.element-row:not(.expanded-row):active { - background: #efefef; + // background: #efefef; } .element-row td { From b7569c861c5f6d815230cc115d18622d0b7f3462 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 12 Jul 2019 13:22:29 +0300 Subject: [PATCH 326/357] [DLAB-855]: removed extra scrollbar from cluster name popup --- .../cluster-details/cluster-details.component.scss | 10 ++++++++++ .../cluster-details/cluster-details.component.ts | 13 +++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.scss index 63eb2694df..0c26eaf4ae 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.scss @@ -17,13 +17,19 @@ * under the License. */ +.detail-dialog { + overflow: hidden; +} + .checkbox-group { position: relative; + label { input[type="checkbox"] { margin: 10px 0; } } + span { &.danger_color { position: absolute; @@ -32,16 +38,19 @@ } } } + .config-details { height: 0; opacity: 0; visibility: hidden; text-align: left; position: relative; + &.show { height: 200px; visibility: visible; opacity: 1; + textarea { height: 100%; resize: none; @@ -49,6 +58,7 @@ line-height: 1.5; font-family: Consolas, monospace; } + span { .danger_color { position: absolute; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts index 186c519705..e3345d9619 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts @@ -52,10 +52,9 @@ export class DetailComputationalResourcesComponent implements OnInit { public dialogRef: MatDialogRef, private dataengineConfigurationService: DataengineConfigurationService, private _fb: FormBuilder - ) {} + ) { } ngOnInit() { - // this.bindDialog.onClosing = () => this.resetDialog(); this.open(this.data.environment, this.data.resource) } @@ -90,7 +89,7 @@ export class DetailComputationalResourcesComponent implements OnInit { this.dataengineConfigurationService .getClusterConfiguration(this.environment.name, this.resource.computational_name) .subscribe((result: any) => this.config = result, - error => this.toastr.error(error.message || 'Configuration loading failed!', 'Oops!')); + error => this.toastr.error(error.message || 'Configuration loading failed!', 'Oops!')); } public editClusterConfiguration(data): void { @@ -99,13 +98,7 @@ export class DetailComputationalResourcesComponent implements OnInit { .subscribe(result => { this.dialogRef.close(); }, - error => this.toastr.error(error.message || 'Edit onfiguration failed!', 'Oops!')); - } - - public resetDialog() { - this.initFormModel(); - - if (this.configuration) this.configuration.nativeElement['checked'] = false; + error => this.toastr.error(error.message || 'Edit onfiguration failed!', 'Oops!')); } private initFormModel(): void { From 1e0b2496522fda9261da1ae1246c99fcea81efac Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 12 Jul 2019 13:47:23 +0300 Subject: [PATCH 327/357] [DLAB-854]: added project name as request parameter to start/stop resources --- .../app/core/services/userResource.service.ts | 8 +-- ...omputational-resources-list.component.html | 65 ++++++++++--------- .../computational-resources-list.component.ts | 40 +++++------- 3 files changed, 54 insertions(+), 59 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/userResource.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/userResource.service.ts index b07c2f1a0b..9c9d96e7f4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/userResource.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/userResource.service.ts @@ -29,7 +29,7 @@ export class UserResourceService { constructor(private applicationServiceFacade: ApplicationServiceFacade) { } public getExploratoryTemplates(project): Observable { - const url = `/${ project }/exploratory_templates`; + const url = `/${project}/exploratory_templates`; return this.applicationServiceFacade .buildGetTemplatesRequest(url) .pipe( @@ -38,7 +38,7 @@ export class UserResourceService { } public getComputationalTemplates(project): Observable { - const url = `/${ project }/computational_templates`; + const url = `/${project}/computational_templates`; return this.applicationServiceFacade .buildGetTemplatesRequest(url) .pipe( @@ -109,8 +109,8 @@ export class UserResourceService { catchError(ErrorUtils.handleServiceError)); } - public toggleStopStartAction(notebook: string, resource: string, action): Observable<{}> { - const url = `/${notebook}/${resource}/${action}`; + public toggleStopStartAction(project, notebook: string, resource: string, action): Observable<{}> { + const url = `/${project}/${notebook}/${resource}/${action}`; if (action === 'stop') { return this.applicationServiceFacade .buildStopSparkClusterAction(JSON.stringify(url)) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html index d4cac2c46c..1b0a13919f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html @@ -19,40 +19,41 @@
      -
      - no details -
      - diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts index 02ede9626b..6ab3022548 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Component, EventEmitter, Input, Output, ViewChild, Inject } from '@angular/core'; +import { Component, EventEmitter, Input, Output, Inject } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { ToastrService } from 'ngx-toastr'; @@ -32,12 +32,8 @@ import { SchedulerComponent } from '../../scheduler'; }) export class ComputationalResourcesListComponent { - @ViewChild('confirmationDialog') confirmationDialog; - @ViewChild('detailComputationalResource') detailComputationalResource; - @ViewChild('clusterScheduler') clusterScheduler; - @Input() resources: any[]; - @Input() environment: any[]; + @Input() environment: any; @Output() buildGrid: EventEmitter<{}> = new EventEmitter(); @@ -47,20 +43,24 @@ export class ComputationalResourcesListComponent { private userResourceService: UserResourceService ) { } - toggleResourceAction(resource, action: string) { + rebuildGrid(): void { + this.buildGrid.emit(); + } + + public toggleResourceAction(resource, action: string): void { if (action === 'stop' || action === 'terminate') { const dialogRef: MatDialogRef = this.dialog.open(ConfirmationDialogComponent, - { data: {action, resource}, width: '550px', panelClass: 'error-modalbox' }); + { data: { action, resource }, width: '550px', panelClass: 'error-modalbox' }); dialogRef.afterClosed().subscribe(result => { if (result && action === 'stop') { this.userResourceService - .toggleStopStartAction(this.environment['name'], resource.computational_name, action) + .toggleStopStartAction(this.environment.project, this.environment.name, resource.computational_name, action) .subscribe(() => { this.rebuildGrid(); }); } else if (result && action === 'terminate') { this.userResourceService - .suspendComputationalResource(this.environment['name'], resource.computational_name) + .suspendComputationalResource(this.environment.name, resource.computational_name) .subscribe(() => { this.rebuildGrid(); }); @@ -68,27 +68,21 @@ export class ComputationalResourcesListComponent { }); } else if (action === 'start') { this.userResourceService - .toggleStopStartAction(this.environment['name'], resource.computational_name, 'start') + .toggleStopStartAction(this.environment.project, this.environment.name, resource.computational_name, 'start') .subscribe( () => this.rebuildGrid(), error => this.toastr.error(error.message || 'Computational resource starting failed!', 'Oops!')); } } - rebuildGrid(): void { - this.buildGrid.emit(); - } - - detailComputationalResources(environment, resource): void { - // this.detailComputationalResource.open({ isFooter: false }, environment, resource); - this.dialog.open(DetailComputationalResourcesComponent, { data: { environment, resource }, panelClass: 'modal-sm'}) - .afterClosed().subscribe(() => this.rebuildGrid()); + public detailComputationalResources(environment, resource): void { + this.dialog.open(DetailComputationalResourcesComponent, { data: { environment, resource }, panelClass: 'modal-sm' }) + .afterClosed().subscribe(() => this.rebuildGrid()); }; - openScheduleDialog(resource) { - // this.clusterScheduler.open({ isFooter: false }, this.environment, 'СOMPUTATIONAL', resource); - this.dialog.open(SchedulerComponent, { data: {notebook: this.environment, type: 'СOMPUTATIONAL', resource}, panelClass: 'modal-xl-s' }) - .afterClosed().subscribe(() => this.rebuildGrid()); + public openScheduleDialog(resource) { + this.dialog.open(SchedulerComponent, { data: { notebook: this.environment, type: 'СOMPUTATIONAL', resource }, panelClass: 'modal-xl-s' }) + .afterClosed().subscribe(() => this.rebuildGrid()); } } From 13c46b1cded3fb04d9a01030201d6f9ba4653f72 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Fri, 12 Jul 2019 16:54:58 +0300 Subject: [PATCH 328/357] [DLAB-851]: added shapes list sorting --- .../computationalResourceImage.model.ts | 6 ++-- .../webapp/src/app/core/util/index.ts | 2 +- .../core/util/{sortUtil.ts => sortUtils.ts} | 2 +- ...tional-resource-create-dialog.component.ts | 5 +-- .../create-environment.component.ts | 7 ++-- .../install-libraries.component.ts | 34 +++++++++---------- .../resources-grid.component.ts | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) rename services/self-service/src/main/resources/webapp/src/app/core/util/{sortUtil.ts => sortUtils.ts} (98%) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/models/computationalResourceImage.model.ts b/services/self-service/src/main/resources/webapp/src/app/core/models/computationalResourceImage.model.ts index b41910231e..102f1dc33b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/models/computationalResourceImage.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/models/computationalResourceImage.model.ts @@ -20,7 +20,7 @@ import { ComputationalResourceApplicationTemplate } from './computationalResourceApplicationTemplate.model'; import { ResourceShapeTypesModel } from './resourceShapeTypes.model'; import { ImageType } from './imageType.enum'; -import { SortUtil } from '../util'; +import { SortUtils } from '../util'; export class ComputationalResourceImage { image: string; @@ -38,13 +38,13 @@ export class ComputationalResourceImage { this.environment_type = ImageType.СOMPUTATIONAL; this.application_templates = []; this.limits = jsonModel.limits; - this.shapes = new ResourceShapeTypesModel(SortUtil.shapesSort(jsonModel.computation_resources_shapes)); + this.shapes = new ResourceShapeTypesModel(SortUtils.shapesSort(jsonModel.computation_resources_shapes)); if (jsonModel.templates && jsonModel.templates.length > 0) for (let index = 0; index < jsonModel.templates.length; index++) this.application_templates.push( new ComputationalResourceApplicationTemplate(jsonModel.templates[index], - this.shapes, this.image, this.template_name, this.description)); + this.shapes, this.image, this.template_name, this.description)); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts index 35462c046e..afef07ea5b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts @@ -18,7 +18,7 @@ */ export * from './http-status-codes'; -export * from './sortUtil'; +export * from './sortUtils'; export * from './errorUtils'; export * from './dateUtils'; export * from './fileUtils'; diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/sortUtil.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/sortUtils.ts similarity index 98% rename from services/self-service/src/main/resources/webapp/src/app/core/util/sortUtil.ts rename to services/self-service/src/main/resources/webapp/src/app/core/util/sortUtils.ts index 6d0abfb155..88c5a22735 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/sortUtil.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/sortUtils.ts @@ -17,7 +17,7 @@ * under the License. */ -export class SortUtil { +export class SortUtils { public static statusSort(arg1: string, arg2: string): number { const order = ['creating', 'running', 'stopping', 'stopped', 'terminating', 'terminated', 'failed']; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts index 761ca2ee9d..cf6e72acb9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts @@ -24,7 +24,7 @@ import { ToastrService } from 'ngx-toastr'; import { ComputationalResourceModel } from './computational-resource-create.model'; import { UserResourceService } from '../../../core/services'; -import { HTTP_STATUS_CODES, PATTERNS, CheckUtils } from '../../../core/util'; +import { HTTP_STATUS_CODES, PATTERNS, CheckUtils, SortUtils } from '../../../core/util'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import { CLUSTER_CONFIGURATION } from './cluster-configuration-templates'; @@ -251,7 +251,8 @@ export class ComputationalResourceCreateDialogComponent implements OnInit { if (this.notebook_instance.template_name.toLowerCase().indexOf('tensorflow') !== -1 || this.notebook_instance.template_name.toLowerCase().indexOf('deep learning') !== -1) { const allowed: any = ['GPU optimized']; - const filtered = Object.keys(this.selectedImage.computation_resources_shapes) + const filtered = Object.keys( + SortUtils.shapesSort(this.selectedImage.computation_resources_shapes)) .filter(key => allowed.includes(key)) .reduce((obj, key) => { obj[key] = this.selectedImage.computation_resources_shapes[key]; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts index 6fc0b0717a..6e0fda56d2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts @@ -24,7 +24,7 @@ import { ToastrService } from 'ngx-toastr'; import { Project } from '../../../administration/project/project.component'; import { UserResourceService, ProjectService } from '../../../core/services'; -import { CheckUtils, HTTP_STATUS_CODES, PATTERNS } from '../../../core/util'; +import { CheckUtils, SortUtils, HTTP_STATUS_CODES, PATTERNS } from '../../../core/util'; import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import { CLUSTER_CONFIGURATION } from '../../computational/computational-resource-create-dialog/cluster-configuration-templates'; @@ -42,7 +42,7 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { templates = []; endpoints: Array = []; currentTemplate: any; - shapes: Array = []; + shapes = [] || {}; resourceGrid: any; images: Array; @@ -79,7 +79,7 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { public getShapes(template) { this.currentTemplate = template; - this.shapes = template.exploratory_environment_shapes; + this.shapes = SortUtils.shapesSort(template.exploratory_environment_shapes); this.getImagesList(); } @@ -105,7 +105,6 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit { } private initFormModel(): void { - this.createExploratoryForm = this._fb.group({ project: ['', Validators.required], endpoint: ['', Validators.required], diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts index a41e6919f3..39602b7c1f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts @@ -25,8 +25,8 @@ import { ToastrService } from 'ngx-toastr'; import { debounceTime } from 'rxjs/operators'; import { InstallLibrariesModel } from './install-libraries.model'; -import { LibrariesInstallationService} from '../../../core/services'; -import { SortUtil, HTTP_STATUS_CODES } from '../../../core/util'; +import { LibrariesInstallationService } from '../../../core/services'; +import { SortUtils, HTTP_STATUS_CODES } from '../../../core/util'; @Component({ @@ -94,7 +94,7 @@ export class InstallLibrariesComponent implements OnInit { } uploadLibGroups(): void { - this.librariesInstallationService.getGroupsList(this.notebook.name, this.model.computational_name) + this.librariesInstallationService.getGroupsList(this.notebook.name, this.model.computational_name) .subscribe( response => { this.libsUploadingStatus(response); @@ -112,12 +112,12 @@ export class InstallLibrariesComponent implements OnInit { private getResourcesList() { this.notebook.type = 'EXPLORATORY'; - this.notebook.title = `${ this.notebook.name } notebook`; + this.notebook.title = `${this.notebook.name} notebook`; return [this.notebook].concat(this.notebook.resources .filter(item => item.status === 'running') .map(item => { item['name'] = item.computational_name; - item['title'] = `${ item.computational_name } cluster`; + item['title'] = `${item.computational_name} cluster`; item['type'] = 'СOMPUTATIONAL'; return item; })); @@ -134,7 +134,7 @@ export class InstallLibrariesComponent implements OnInit { const templateCheck = PREVENT_TEMPLATES.some(template => CURRENT_TEMPLATE.indexOf(template) !== -1); const filteredGroups = templateCheck ? groupsList.filter(group => group !== 'java') : groupsList; - return SortUtil.libGroupsSort(filteredGroups); + return SortUtils.libGroupsSort(filteredGroups); } public onUpdate($event) { @@ -156,7 +156,7 @@ export class InstallLibrariesComponent implements OnInit { } public isDuplicated(item) { - const select = {group: this.group, name: item.name, version: item.version}; + const select = { group: this.group, name: item.name, version: item.version }; this.isInSelectedList = this.model.selectedLibs.filter(el => JSON.stringify(el) === JSON.stringify(select)).length > 0; @@ -171,7 +171,7 @@ export class InstallLibrariesComponent implements OnInit { } public selectLibrary(item): void { - this.model.selectedLibs.push({group: this.group, name: item.name, version: item.version}); + this.model.selectedLibs.push({ group: this.group, name: item.name, version: item.version }); this.query = ''; this.libSearch.setValue(''); @@ -220,7 +220,7 @@ export class InstallLibrariesComponent implements OnInit { } public reinstallLibrary(item, lib) { - const retry = [{group: lib.group, name: lib.name, version: lib.version}]; + const retry = [{ group: lib.group, name: lib.name, version: lib.version }]; if (this.getResourcesList().find(el => el.name === item.resource).type === 'СOMPUTATIONAL') { this.model.confirmAction(retry, item.resource); @@ -263,13 +263,13 @@ export class InstallLibrariesComponent implements OnInit { .subscribe( lib => this.filteredList = [lib], error => { - if (error.status === HTTP_STATUS_CODES.NOT_FOUND - || error.status === HTTP_STATUS_CODES.BAD_REQUEST - || error.status === HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) { - this.validity_format = error.message; - this.filteredList = null; - } - }); + if (error.status === HTTP_STATUS_CODES.NOT_FOUND + || error.status === HTTP_STATUS_CODES.BAD_REQUEST + || error.status === HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) { + this.validity_format = error.message; + this.filteredList = null; + } + }); } else { this.model.getLibrariesList(this.group, this.query) .subscribe(libs => this.filteredList = libs); @@ -290,7 +290,7 @@ export class InstallLibrariesComponent implements OnInit { this.isInSelectedList = false; this.uploading = false; this.model.selectedLibs = []; - this.filteredList = null ; + this.filteredList = null; this.destination = null; this.groupsList = []; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 881f74bf16..d1084eb17d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -29,7 +29,7 @@ import { ExploratoryModel, Exploratory } from './resources-grid.model'; import { FilterConfigurationModel } from './filter-configuration.model'; import { GeneralEnvironmentStatus } from '../../administration/management/management.model'; import { ConfirmationDialogType } from '../../shared'; -import { SortUtil, CheckUtils } from '../../core/util'; +import { SortUtils, CheckUtils } from '../../core/util'; import { DetailDialogComponent } from '../exploratory/detail-dialog'; import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog'; import { InstallLibrariesComponent } from '../exploratory/install-libraries'; From 6f8438ec6b59be6e03a9fcbea72db2070a3a687b Mon Sep 17 00:00:00 2001 From: bhliva Date: Fri, 12 Jul 2019 17:10:21 +0300 Subject: [PATCH 329/357] DLAB-000 changed stop computational API and fixed project creation logic --- .../src/general/scripts/aws/edge_configure.py | 2 +- .../service/impl/ProjectServiceImpl.java | 19 ++++- .../mock_response/aws/edge_create.json | 75 ++++++++++--------- .../mock_response/aws/project_create.json | 2 +- .../aws/ComputationalResourceAws.java | 2 +- .../azure/ComputationalResourceAzure.java | 2 +- .../gcp/ComputationalResourceGcp.java | 2 +- 7 files changed, 60 insertions(+), 44 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index f167985bdc..2c404da177 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -246,7 +246,7 @@ "notebook_subnet": edge_conf['private_subnet_cidr'], "full_edge_conf": edge_conf, "project_name": os.environ['project_name'], - "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp", + "@class": "com.epam.dlab.dto.aws.edge.EdgeInfoAws", "Action": "Create new EDGE server"} print(json.dumps(res)) result.write(json.dumps(res)) diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 9504fadd99..650a42beb3 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -7,7 +7,10 @@ import com.epam.dlab.backendapi.core.response.folderlistener.FolderListenerExecutor; import com.epam.dlab.backendapi.core.response.handlers.ProjectCallbackHandler; import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.cloud.CloudProvider; import com.epam.dlab.dto.ResourceBaseDTO; +import com.epam.dlab.dto.aws.edge.EdgeInfoAws; +import com.epam.dlab.dto.azure.edge.EdgeInfoAzure; import com.epam.dlab.dto.gcp.edge.EdgeInfoGcp; import com.epam.dlab.dto.project.ProjectActionDTO; import com.epam.dlab.dto.project.ProjectCreateDTO; @@ -61,11 +64,12 @@ private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerActio folderListenerExecutor.start(configuration.getKeyLoaderDirectory(), configuration.getKeyLoaderPollTimeout(), new ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getName(), uuid, - action, CALLBACK_URI, projectName, EdgeInfoGcp.class)); + action, CALLBACK_URI, projectName, getEdgeClass())); RunDockerCommand runDockerCommand = new RunDockerCommand() .withInteractive() - .withName(String.join("_", projectName, resourceType, action.toString())) + .withName(String.join("_", userInfo.getName(), projectName, resourceType, action.toString(), + Long.toString(System.currentTimeMillis()))) .withVolumeForRootKeys(configuration.getKeyDirectory()) .withVolumeForResponse(configuration.getKeyLoaderDirectory()) .withVolumeForLog(configuration.getDockerLogDirectory(), resourceType) @@ -82,4 +86,15 @@ private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerActio } return uuid; } + + private Class getEdgeClass() { + if (configuration.getCloudProvider() == CloudProvider.AWS) { + return (Class) EdgeInfoAws.class; + } else if (configuration.getCloudProvider() == CloudProvider.AZURE) { + return (Class) EdgeInfoAzure.class; + } else if (configuration.getCloudProvider() == CloudProvider.GCP) { + return (Class) EdgeInfoGcp.class; + } + throw new IllegalArgumentException(); + } } diff --git a/services/provisioning-service/src/main/resources/mock_response/aws/edge_create.json b/services/provisioning-service/src/main/resources/mock_response/aws/edge_create.json index cda1c9e32d..fe2bf0a8cf 100644 --- a/services/provisioning-service/src/main/resources/mock_response/aws/edge_create.json +++ b/services/provisioning-service/src/main/resources/mock_response/aws/edge_create.json @@ -1,40 +1,41 @@ { - "status": "ok", - "response": { - "result": { - "instance_id": "${INSTANCE_ID}", - "tunnel_port": "22", - "full_edge_conf": { - "notebook_role_profile_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-Profile", - "tag_name": "${CONF_SERVICE_BASE_NAME}-Tag", - "edge_security_group_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-SG", - "allocation_id": "eipalloc-2801084f", - "key_name": "${CONF_KEY_NAME}", - "edge_public_ip": "35.166.104.208", - "instance_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge", - "edge_private_ip": "172.31.15.80", - "bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", - "user_keyname": "${EDGE_USER_NAME}", - "private_subnet_cidr": "172.31.48.0/24", - "notebook_instance_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb", - "service_base_name": "${CONF_SERVICE_BASE_NAME}", - "notebook_security_group_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-SG", - "shared_bucket_name": "${CONF_SERVICE_BASE_NAME}-shared-bucket" - }, - "notebook_sg": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-SG", - "ip": "172.31.15.80", - "hostname": "ec2-35-166-104-208.us-west-2.compute.amazonaws.com", - "user_own_bicket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", - "notebook_profile": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-Profile", - "public_ip": "35.166.104.208", - "key_name": "${CONF_KEY_NAME}", - "Action": "Create new EDGE server", - "edge_sg": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-SG", - "socks_port": "1080", - "notebook_subnet": "172.31.48.0/24", - "shared_bucket_name": "${CONF_SERVICE_BASE_NAME}-shared-bucket" + "status": "ok", + "response": { + "result": { + "instance_id": "${INSTANCE_ID}", + "tunnel_port": "22", + "full_edge_conf": { + "notebook_role_profile_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-Profile", + "tag_name": "${CONF_SERVICE_BASE_NAME}-Tag", + "edge_security_group_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-SG", + "allocation_id": "eipalloc-2801084f", + "key_name": "${CONF_KEY_NAME}", + "edge_public_ip": "35.166.104.208", + "instance_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge", + "edge_private_ip": "172.31.15.80", + "bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", + "user_keyname": "${EDGE_USER_NAME}", + "private_subnet_cidr": "172.31.48.0/24", + "notebook_instance_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb", + "service_base_name": "${CONF_SERVICE_BASE_NAME}", + "notebook_security_group_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-SG", + "shared_bucket_name": "${CONF_SERVICE_BASE_NAME}-shared-bucket" }, - "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log" - }, - "request_id": "${REQUEST_ID}" + "notebook_sg": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-SG", + "ip": "172.31.15.80", + "hostname": "ec2-35-166-104-208.us-west-2.compute.amazonaws.com", + "user_own_bicket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket", + "notebook_profile": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-Profile", + "public_ip": "35.166.104.208", + "key_name": "${CONF_KEY_NAME}", + "Action": "Create new EDGE server", + "edge_sg": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-SG", + "socks_port": "1080", + "notebook_subnet": "172.31.48.0/24", + "@class": "com.epam.dlab.dto.aws.edge.EdgeInfoAws", + "shared_bucket_name": "${CONF_SERVICE_BASE_NAME}-shared-bucket" + }, + "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log" + }, + "request_id": "${REQUEST_ID}" } \ No newline at end of file diff --git a/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json b/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json index 31ca8e5c8a..d5f2d68649 100644 --- a/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json +++ b/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json @@ -49,7 +49,7 @@ "socks_port": "1080", "notebook_subnet": "10.10.16.0/24", "project_name": "${PROJECT_NAME}", - "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp" + "@class": "com.epam.dlab.dto.aws.edge.EdgeInfoAws" }, "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log" }, diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java index 222d0b9c77..a4487c8e21 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/aws/ComputationalResourceAws.java @@ -171,7 +171,7 @@ public Response terminate(@ApiParam(hidden = true) @Auth UserInfo userInfo, * @return 200 OK if operation is successfully triggered */ @DELETE - @Path("/{exploratoryName}/{computationalName}/stop") + @Path("/{project}/{exploratoryName}/{computationalName}/stop") @ApiOperation("Stops Spark cluster on AWS") @ApiResponses(@ApiResponse(code = 200, message = "Spark cluster on AWS successfully stopped")) public Response stop(@ApiParam(hidden = true) @Auth UserInfo userInfo, diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java index 3441adacd6..e5b4b34255 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/azure/ComputationalResourceAzure.java @@ -141,7 +141,7 @@ public Response terminate(@ApiParam(hidden = true) @Auth UserInfo userInfo, * @return 200 OK if operation is successfully triggered */ @DELETE - @Path("/{exploratoryName}/{computationalName}/stop") + @Path("/{project}/{exploratoryName}/{computationalName}/stop") @ApiOperation("Stops Spark cluster on Azure") @ApiResponses(@ApiResponse(code = 200, message = "Spark cluster on Azure successfully stopped")) public Response stop(@ApiParam(hidden = true) @Auth UserInfo userInfo, diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java index f213e28825..8e3f14197d 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/gcp/ComputationalResourceGcp.java @@ -172,7 +172,7 @@ public Response terminate(@ApiParam(hidden = true) @Auth UserInfo userInfo, * @return 200 OK if operation is successfully triggered */ @DELETE - @Path("/{exploratoryName}/{computationalName}/stop") + @Path("/{project}/{exploratoryName}/{computationalName}/stop") @ApiOperation("Stops Spark cluster on GCP") @ApiResponses(@ApiResponse(code = 200, message = "Spark cluster on GCP successfully stopped")) public Response stop(@ApiParam(hidden = true) @Auth UserInfo userInfo, From fb4e80d1bda8184117061045801738d9996cb431 Mon Sep 17 00:00:00 2001 From: bhliva Date: Fri, 12 Jul 2019 17:12:31 +0300 Subject: [PATCH 330/357] DLAB-000 fixed error message in case of dublicated endpoint --- .../epam/dlab/backendapi/service/impl/EndpointServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java index 47377cdc54..fd9273ca79 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java @@ -33,7 +33,7 @@ public void create(EndpointDTO endpointDTO) { if (!endpointDAO.get(endpointDTO.getName()).isPresent()) { endpointDAO.create(endpointDTO); } else { - throw new ResourceConflictException("Project with passed name already exist in system"); + throw new ResourceConflictException("Endpoint with passed name already exist in system"); } } From d41cd4ce6e6810ded3bfaabbbdfb2da019c25c42 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 15 Jul 2019 12:19:55 +0300 Subject: [PATCH 331/357] [DLAB-854]: management grid and configuration model fixes --- .../management-grid.component.ts | 11 ++++++----- .../management/management.component.ts | 8 ++++---- .../management/management.model.ts | 18 +++++++++++++++++- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts index e717e9be79..9034816f28 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts @@ -25,6 +25,7 @@ import { HealthStatusService } from '../../../core/services'; import { ConfirmationDialogType } from '../../../shared'; import { ConfirmationDialogComponent } from '../../../shared/modal-dialog/confirmation-dialog'; import { EnvironmentsDataService } from '../management-data.service'; +import { EnvironmentModel } from '../management.model'; export interface ManageAction { action: string; @@ -62,7 +63,7 @@ export class ManagementGridComponent implements OnInit { ) { } ngOnInit() { - this.environmentsDataService._data.subscribe(data => this.allEnvironmentData = data); + this.environmentsDataService._data.subscribe(data => this.allEnvironmentData = EnvironmentModel.loadEnvironments(data)); } buildGrid(): void { @@ -79,7 +80,7 @@ export class ManagementGridComponent implements OnInit { result && this.actionToggle.emit({ action, environment, resource }); }); } else { - const type = (environment.resource_type.toLowerCase() === 'edge node') + const type = (environment.type.toLowerCase() === 'edge node') ? ConfirmationDialogType.StopEdgeNode : ConfirmationDialogType.StopExploratory; if (action === 'stop') { @@ -109,9 +110,9 @@ export class ManagementGridComponent implements OnInit { if (notebook.name === 'edge node') { return this.allEnvironmentData .filter(env => env.user === notebook.user) - .some(el => this.inProgress([el]) || this.inProgress(el.computational_resources)); - } else if (notebook.computational_resources.length) { - return this.inProgress(notebook.computational_resources); + .some(el => this.inProgress([el]) || this.inProgress(el.resources)); + } else if (notebook.resources && notebook.resources.length) { + return this.inProgress(notebook.resources); } } return false; diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index c737bdbc09..246c19bbf9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -77,7 +77,7 @@ export class ManagementComponent implements OnInit { $event.environment.user, $event.action, $event.environment.resource_type === 'edge node' ? 'edge' : $event.environment.resource_name, - $event.computational_resources ? $event.computational_resources.computational_name : null + $event.resources ? $event.resources.computational_name : null ).subscribe( () => this.buildGrid(), error => this.toastr.error('Environment management failed!', 'Oops!')); @@ -108,9 +108,9 @@ export class ManagementComponent implements OnInit { } isEnvironmentsInProgress(data): boolean { - return data.some(el => { - return el.status === 'creating' || el.status === 'starting' || - el.computational_resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring'); + return data.some(item => { + return item.exploratory.some(el => el.status === 'creating' || el.status === 'starting' || + el.resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring')); }); } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts index 641e098cb9..dcc293c335 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts @@ -25,8 +25,24 @@ export class EnvironmentModel { public resources: Array, public user: string, public ip: string, - public type?: string + public type?: string, + public project?: string, ) { } + + public static loadEnvironments(data: Array) { + if (data) { + return data.map(value => new EnvironmentModel( + value.resource_name, + value.status, + value.shape, + value.computational_resources, + value.user, + value.public_ip, + value.resource_type, + value.project, + )); + } + } } export class BackupOptionsModel { From 1fa4b7604ea59f39111abea4e0ad19bce3398aa5 Mon Sep 17 00:00:00 2001 From: bhliva Date: Mon, 15 Jul 2019 14:18:15 +0300 Subject: [PATCH 332/357] DLAB-000 fixed issue with docker container name --- .../epam/dlab/backendapi/service/impl/ProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index 650a42beb3..e3fd8e7b0b 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -63,7 +63,7 @@ private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerActio folderListenerExecutor.start(configuration.getKeyLoaderDirectory(), configuration.getKeyLoaderPollTimeout(), - new ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getName(), uuid, + new ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getSimpleName(), uuid, action, CALLBACK_URI, projectName, getEdgeClass())); RunDockerCommand runDockerCommand = new RunDockerCommand() From 5280bcaf175cad749200349d4183e6fad3908397 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 15 Jul 2019 14:46:50 +0300 Subject: [PATCH 333/357] [DLAB-854]: resource type fix to stop/terminate smb environment --- .../management/management.component.ts | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index 246c19bbf9..15dd8c3943 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -35,6 +35,7 @@ import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; import { ManageEnvironmentComponent } from './manage-environment/manage-environment-dilog.component'; import { EndpointsComponent } from './endpoints/endpoints.component'; +import { ExploratoryModel } from '../../resources/resources-grid/resources-grid.model'; import { EnvironmentsDataService } from './management-data.service'; @@ -48,7 +49,6 @@ export class ManagementComponent implements OnInit { public healthStatus: GeneralEnvironmentStatus; public allEnvironmentData: Array; public anyEnvInProgress: boolean = false; - public notebookInProgress: boolean = false; constructor( public toastr: ToastrService, @@ -76,7 +76,7 @@ export class ManagementComponent implements OnInit { .environmentManagement( $event.environment.user, $event.action, - $event.environment.resource_type === 'edge node' ? 'edge' : $event.environment.resource_name, + $event.environment.type === 'edge node' ? 'edge' : $event.environment.resource_name, $event.resources ? $event.resources.computational_name : null ).subscribe( () => this.buildGrid(), @@ -107,17 +107,13 @@ export class ManagementComponent implements OnInit { this.dialog.open(SsnMonitorComponent, { panelClass: 'modal-lg' }); } - isEnvironmentsInProgress(data): boolean { - return data.some(item => { + isEnvironmentsInProgress(exploratory): boolean { + return exploratory.some(item => { return item.exploratory.some(el => el.status === 'creating' || el.status === 'starting' || el.resources.some(elem => elem.status === 'creating' || elem.status === 'starting' || elem.status === 'configuring')); }); } - isNotebookInProgress(data): boolean { - return data.some(el => el.status === 'creating'); - } - setBudgetLimits($event) { this.healthStatusService.updateUsersBudget($event.users).subscribe((result: any) => { this.healthStatusService.updateTotalBudgetData($event.total).subscribe((res: any) => { @@ -147,10 +143,8 @@ export class ManagementComponent implements OnInit { private getExploratoryList() { this.userResourceService.getUserProvisionedResources() - .subscribe((result) => { - this.anyEnvInProgress = this.isEnvironmentsInProgress(result); - this.notebookInProgress = this.isNotebookInProgress(result); - }); + .subscribe((result) => this.anyEnvInProgress = this.isEnvironmentsInProgress( + ExploratoryModel.loadEnvironments(result))); } private getEnvironmentHealthStatus() { From 8710effb2c2c5e85a99b9012488dc7787f80e404 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 15 Jul 2019 14:57:59 +0300 Subject: [PATCH 334/357] [DLAB-854]: prevent actions for edge nodes in management page --- .../management-grid/management-grid.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html index ff152257ab..14c3b89535 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html @@ -25,18 +25,18 @@ -
    		Type Project {{ element.project }} Type {{ element.resource_name || element.resource_type }}{{ element.name || element.type }} Shape / Resource id {{ element.shape || element.public_ip }}{{ element.shape || element.ip }} - From 33ec031d08f7b6a6ea4f46cf298a41c3358a1283 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Mon, 15 Jul 2019 15:23:39 +0300 Subject: [PATCH 335/357] [DLAB-867]: added filtering controls to resources list --- .../resources-grid.component.html | 61 ++++++++++++++++--- .../resources-grid.component.ts | 16 +++-- 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index feba6d0f10..bdd30a77c4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -24,19 +24,13 @@ {{ element.project }} {{ column.title }} -
    {{ element.name }} @@ -133,13 +127,63 @@ + + + + + + + + + + +
    + + + +
    +
    @@ -167,6 +211,9 @@ + + + = [ - { title: 'Environment name', name: 'name', class: 'name-col', filtering: {} }, - { title: 'Status', name: 'statuses', class: 'status-col', filtering: {} }, - { title: DICTIONARY.instance_size, name: 'shapes', class: 'shape-col', filtering: {} }, - { title: DICTIONARY.computational_resource, name: 'resources', class: 'resources-col', filtering: {} }, - { title: 'Cost', name: 'cost', class: 'cost-col' }, - { title: '', name: 'actions', class: 'actions-col' } + { title: 'Environment name', name: 'name', class: 'name-col', filter: 'name-filter' }, + { title: 'Status', name: 'statuses', class: 'status-col', filter: 'status-filter' }, + { title: DICTIONARY.instance_size, name: 'shapes', class: 'shape-col', filter: 'shape-filter' }, + { title: DICTIONARY.computational_resource, name: 'resources', class: 'resources-col', filter: 'resource-filter' }, + { title: 'Cost', name: 'cost', class: 'cost-col', filter: 'cost-filter' }, + { title: '', name: 'actions', class: 'actions-col', filter: 'action-filter' } ]; displayedColumns: string[] = this.filteringColumns.map(item => item.name); + displayedFilterColumns: string[] = this.filteringColumns.map(item => item.filter); constructor( public toastr: ToastrService, From 12e3206f3a77d07e19b55d5805addabbdd056154 Mon Sep 17 00:00:00 2001 From: bhliva Date: Mon, 15 Jul 2019 15:42:16 +0300 Subject: [PATCH 336/357] DLAB-000 fixed issue with docker container name --- .../epam/dlab/backendapi/service/impl/ProjectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java index e3fd8e7b0b..670cadc8d2 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java @@ -63,12 +63,12 @@ private String executeDocker(UserInfo userInfo, ResourceBaseDTO dto, DockerActio folderListenerExecutor.start(configuration.getKeyLoaderDirectory(), configuration.getKeyLoaderPollTimeout(), - new ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getSimpleName(), uuid, + new ProjectCallbackHandler(systemUserInfoService, selfService, userInfo.getName(), uuid, action, CALLBACK_URI, projectName, getEdgeClass())); RunDockerCommand runDockerCommand = new RunDockerCommand() .withInteractive() - .withName(String.join("_", userInfo.getName(), projectName, resourceType, action.toString(), + .withName(String.join("_", userInfo.getSimpleName(), projectName, resourceType, action.toString(), Long.toString(System.currentTimeMillis()))) .withVolumeForRootKeys(configuration.getKeyDirectory()) .withVolumeForResponse(configuration.getKeyLoaderDirectory()) From 51033ac9d2fbf8a006e94822bc7171a4bd9657f0 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 16 Jul 2019 14:46:30 +0300 Subject: [PATCH 337/357] [DLAB-867]: added filtering controls to resources list --- .../resources-grid.component.html | 21 +++++-- .../resources-grid.component.scss | 16 +++++ .../resources-grid.component.ts | 59 ++++++++++--------- 3 files changed, 62 insertions(+), 34 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index bdd30a77c4..62c102284f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -25,7 +25,15 @@ {{ element.project }} - {{ column.title }} + + {{ column.title }} + + - + - + - + - + - + @@ -180,6 +188,7 @@ + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss index c40c2cd2c8..cf2d788263 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss @@ -24,6 +24,13 @@ table { width: 100%; + .header-row { + .label { + display: inline-block; + padding-top: 10px; + } + } + .exploratory { padding: 0; @@ -35,6 +42,11 @@ table { border-bottom: 1px solid #d9d9d9; } } + + } + + .filter-row { + height: 0 !important; } .name-col { @@ -44,19 +56,23 @@ table { .status-col { width: 16%; + padding: 5px; } .shape-col { width: 16%; + padding: 5px; } .resources-col { width: 30%; + padding: 5px; } .cost-col { width: 10%; text-align: center; + } .actions-col { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index 7bc9595901..a7f868e929 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -63,7 +63,7 @@ export class ResourcesGridComponent implements OnInit { filteredEnvironments: Exploratory[] = []; - filterConfiguration: FilterConfigurationModel; + filterConfiguration: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); filterForm: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); isOutscreenDropdown: boolean; @@ -73,16 +73,16 @@ export class ResourcesGridComponent implements OnInit { healthStatus: GeneralEnvironmentStatus; public filteringColumns: Array = [ - { title: 'Environment name', name: 'name', class: 'name-col', filter: 'name-filter' }, - { title: 'Status', name: 'statuses', class: 'status-col', filter: 'status-filter' }, - { title: DICTIONARY.instance_size, name: 'shapes', class: 'shape-col', filter: 'shape-filter' }, - { title: DICTIONARY.computational_resource, name: 'resources', class: 'resources-col', filter: 'resource-filter' }, - { title: 'Cost', name: 'cost', class: 'cost-col', filter: 'cost-filter' }, - { title: '', name: 'actions', class: 'actions-col', filter: 'action-filter' } + { title: 'Environment name', name: 'name', class: 'name-col', filter_class: 'name-filter', filtering: true }, + { title: 'Status', name: 'statuses', class: 'status-col', filter_class: 'status-filter', filtering: true }, + { title: DICTIONARY.instance_size, name: 'shapes', class: 'shape-col', filter_class: 'shape-filter', filtering: true }, + { title: DICTIONARY.computational_resource, name: 'resources', class: 'resources-col', filter_class: 'resource-filter', filtering: true }, + { title: 'Cost', name: 'cost', class: 'cost-col', filter_class: 'cost-filter', filtering: false }, + { title: '', name: 'actions', class: 'actions-col', filter_class: 'action-filter', filtering: false } ]; displayedColumns: string[] = this.filteringColumns.map(item => item.name); - displayedFilterColumns: string[] = this.filteringColumns.map(item => item.filter); + displayedFilterColumns: string[] = this.filteringColumns.map(item => item.filter_class); constructor( public toastr: ToastrService, @@ -92,7 +92,6 @@ export class ResourcesGridComponent implements OnInit { ngOnInit(): void { this.buildGrid(); - debugger; } public buildGrid(): void { @@ -104,35 +103,35 @@ export class ResourcesGridComponent implements OnInit { }); } + public toggleFilterRow(): void { + this.collapseFilterRow = !this.collapseFilterRow; + } - - toggleFilterRow(): void { - this.collapseFilterRow = !this.collapseFilterRow; - } - getDefaultFilterConfiguration(): void { - // const data: Exploratory[] = this.environments; + const data: Exploratory[] = this.environments; const shapes = [], statuses = [], resources = []; - // data.forEach((item: any) => { - // if (shapes.indexOf(item.shape) === -1) - // shapes.push(item.shape); - // if (statuses.indexOf(item.status) === -1) - // statuses.push(item.status); - // statuses.sort(SortUtil.statusSort); - - // item.resources.forEach((resource: any) => { - // if (resources.indexOf(resource.status) === -1) - // resources.push(resource.status); - // resources.sort(SortUtil.statusSort); - // }); - // }); + data.filter(elem => elem.exploratory.forEach((item: any) => { + if (shapes.indexOf(item.shape) === -1) + shapes.push(item.shape); + if (statuses.indexOf(item.status) === -1) + statuses.push(item.status); + statuses.sort(SortUtils.statusSort); + + item.resources.forEach((resource: any) => { + if (resources.indexOf(resource.status) === -1) + resources.push(resource.status); + resources.sort(SortUtils.statusSort); + }); + })); this.filterConfiguration = new FilterConfigurationModel('', statuses, shapes, resources, ''); + + debugger; } applyFilter_btnClick(config: FilterConfigurationModel) { @@ -298,4 +297,8 @@ export class ResourcesGridComponent implements OnInit { .afterClosed().subscribe(() => this.buildGrid()); } } + + + + } From 7e2a26f4dae401de320ba8087455788919341570 Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 16 Jul 2019 16:08:17 +0300 Subject: [PATCH 338/357] DLAB-906 fixed bug with env management page --- .../mock_response/aws/project_terminate.json | 12 +++++++++++ .../dlab/backendapi/domain/ProjectDTO.java | 17 +++++++++++++++ .../resources/callback/ProjectCallback.java | 3 ++- .../service/impl/EnvironmentServiceImpl.java | 21 ++++++++++++------- 4 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 services/provisioning-service/src/main/resources/mock_response/aws/project_terminate.json diff --git a/services/provisioning-service/src/main/resources/mock_response/aws/project_terminate.json b/services/provisioning-service/src/main/resources/mock_response/aws/project_terminate.json new file mode 100644 index 0000000000..5de66ef94f --- /dev/null +++ b/services/provisioning-service/src/main/resources/mock_response/aws/project_terminate.json @@ -0,0 +1,12 @@ +{ + "status": "ok", + "response": { + "result": { + "Action": "Terminate edge node", + "service_base_name": "${CONF_SERVICE_BASE_NAME}", + "user_name": "${EDGE_USER_NAME}" + }, + "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log" + }, + "request_id": "${REQUEST_ID}" +} \ No newline at end of file diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java index 631cc999d0..08b02acc1e 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java @@ -54,5 +54,22 @@ public static Status from(UserInstanceStatus userInstanceStatus) { } return Status.valueOf(userInstanceStatus.name()); } + + public static UserInstanceStatus from(Status status) { + if (status == ACTIVE) { + return UserInstanceStatus.RUNNING; + } else if (status == ACTIVATING) { + return UserInstanceStatus.STARTING; + } else if (status == DEACTIVATING) { + return UserInstanceStatus.STOPPING; + } else if (status == NOT_ACTIVE) { + return UserInstanceStatus.STOPPED; + } else if (status == DELETING) { + return UserInstanceStatus.TERMINATING; + } else if (status == DELETED) { + return UserInstanceStatus.TERMINATED; + } + throw new IllegalArgumentException(); + } } } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java index 60ef82bc5a..78489ab990 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java @@ -15,6 +15,7 @@ import javax.ws.rs.Path; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import java.util.Objects; @Path("/project/status") @Consumes(MediaType.APPLICATION_JSON) @@ -36,7 +37,7 @@ public Response updateProjectStatus(@Auth UserInfo userInfo, ProjectResult proje requestId.checkAndRemove(projectResult.getRequestId()); final String projectName = projectResult.getProjectName(); final UserInstanceStatus status = UserInstanceStatus.of(projectResult.getStatus()); - if (UserInstanceStatus.RUNNING == status) { + if (UserInstanceStatus.RUNNING == status && Objects.nonNull(projectResult.getEdgeInfo())) { projectDAO.updateEdgeInfoAndStatus(projectName, projectResult.getEdgeInfo(), ProjectDTO.Status.ACTIVE); } else { projectDAO.updateStatus(projectName, ProjectDTO.Status.from(status)); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java index 1a68cd1ba8..af853e0aa8 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java @@ -98,7 +98,7 @@ public Set getUserNames() { public List getAllEnv() { log.debug("Getting all user's environment..."); List expList = exploratoryDAO.getInstances(); - return projectService.getProjectsWithStatus(ProjectDTO.Status.ACTIVE) + return projectService.getProjects() .stream() .map(projectDTO -> getProjectEnv(projectDTO, expList)).flatMap(Collection::stream) .collect(toList()); @@ -227,13 +227,18 @@ private void terminateCluster(String user, String exploratoryName, String comput } private List getProjectEnv(ProjectDTO projectDTO, List allInstances) { - UserResourceInfo edgeResource = new UserResourceInfo().withResourceType(ResourceEnum.EDGE_NODE) - .withResourceStatus("running") - .withProject(projectDTO.getName()) - .withIp(projectDTO.getEdgeInfo().getPublicIp()); - return Stream.concat(Stream.of(edgeResource), allInstances.stream() - .filter(instance -> instance.getProject().equals(projectDTO.getName())).map(this::toUserResourceInfo)) - .collect(toList()); + final Stream userResources = allInstances.stream() + .filter(instance -> instance.getProject().equals(projectDTO.getName())).map(this::toUserResourceInfo); + if (projectDTO.getEdgeInfo() != null) { + UserResourceInfo edgeResource = new UserResourceInfo().withResourceType(ResourceEnum.EDGE_NODE) + .withResourceStatus(ProjectDTO.Status.from(projectDTO.getStatus()).toString()) + .withProject(projectDTO.getName()) + .withIp(projectDTO.getEdgeInfo().getPublicIp()); + return Stream.concat(Stream.of(edgeResource), userResources) + .collect(toList()); + } else { + return userResources.collect(toList()); + } } private UserResourceInfo toUserResourceInfo(UserInstanceDTO userInstance) { From 80827ec214421e3eee7df623147a9965fea2bf20 Mon Sep 17 00:00:00 2001 From: bhliva Date: Tue, 16 Jul 2019 17:11:55 +0300 Subject: [PATCH 339/357] DLAB-000 added project_name param for check inactivity --- .../java/com/epam/dlab/backendapi/util/RequestBuilder.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java index cd88930755..bcfcd5f0bc 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java @@ -551,7 +551,8 @@ public > T newComputationalCheckInactivity(UserIn .withApplicationName(getApplicationNameFromImage(exploratory.getImageName())) .withNotebookImageName(exploratory.getImageName()) .withImage(cr.getImageName()) - .withComputationalId(cr.getComputationalId()); + .withComputationalId(cr.getComputationalId()) + .withProject(exploratory.getProject()); } @@ -614,7 +615,8 @@ public ExploratoryCheckInactivityAction newExploratoryCheckInactivityAction(User dto.withNotebookInstanceName(userInstance.getExploratoryId()) .withNotebookImage(userInstance.getImageName()) .withExploratoryName(userInstance.getExploratoryName()) - .withReuploadKeyRequired(userInstance.isReuploadKeyRequired()); + .withReuploadKeyRequired(userInstance.isReuploadKeyRequired()) + .withProject(userInstance.getProject()); return dto; } From a322bd86cb3ddaccc57600bc549a99ab7b206498 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 16 Jul 2019 17:20:17 +0300 Subject: [PATCH 340/357] [DLAB-867]: filtering by status and shapes --- .../resources-grid.component.html | 4 +- .../resources-grid.component.scss | 6 ++ .../resources-grid.component.ts | 101 +++++++++++------- 3 files changed, 70 insertions(+), 41 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index 62c102284f..bda825c27e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -157,8 +157,8 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss index cf2d788263..b984844456 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss @@ -47,6 +47,12 @@ table { .filter-row { height: 0 !important; + + th { + &:last-child { + padding-right: 6px; + } + } } .name-col { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index a7f868e929..a3ec44cd26 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -58,20 +58,10 @@ export class ResourcesGridComponent implements OnInit { environments: Exploratory[]; forse: boolean = true; - - - - filteredEnvironments: Exploratory[] = []; filterConfiguration: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); filterForm: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); - isOutscreenDropdown: boolean; - collapseFilterRow: boolean = false; - filtering: boolean = false; - activeFiltering: boolean = false; - healthStatus: GeneralEnvironmentStatus; - public filteringColumns: Array = [ { title: 'Environment name', name: 'name', class: 'name-col', filter_class: 'name-filter', filtering: true }, { title: 'Status', name: 'statuses', class: 'status-col', filter_class: 'status-filter', filtering: true }, @@ -81,8 +71,25 @@ export class ResourcesGridComponent implements OnInit { { title: '', name: 'actions', class: 'actions-col', filter_class: 'action-filter', filtering: false } ]; - displayedColumns: string[] = this.filteringColumns.map(item => item.name); - displayedFilterColumns: string[] = this.filteringColumns.map(item => item.filter_class); + public displayedColumns: string[] = this.filteringColumns.map(item => item.name); + public displayedFilterColumns: string[] = this.filteringColumns.map(item => item.filter_class); + + + + + + + + isOutscreenDropdown: boolean; + collapseFilterRow: boolean = false; + filtering: boolean = false; + activeFiltering: boolean = false; + healthStatus: GeneralEnvironmentStatus; + + + + + constructor( public toastr: ToastrService, @@ -109,9 +116,8 @@ export class ResourcesGridComponent implements OnInit { - - - getDefaultFilterConfiguration(): void { + // PRIVATE + private getDefaultFilterConfiguration(): void { const data: Exploratory[] = this.environments; const shapes = [], statuses = [], resources = []; @@ -130,36 +136,53 @@ export class ResourcesGridComponent implements OnInit { })); this.filterConfiguration = new FilterConfigurationModel('', statuses, shapes, resources, ''); + } - debugger; + + + private getEnvironmentsListCopy() { + // let filteredData: any = this.environments.map(env => (Object).create(env)); + return this.environments.map(env => JSON.parse(JSON.stringify(env))); } + + + applyFilter_btnClick(config: FilterConfigurationModel) { this.filtering = true; + let filteredData = this.getEnvironmentsListCopy(); - let filteredData: Exploratory[] = this.environments.map(env => (Object).assign({}, env)); - // let filteredData: any = this.environments.map(env => (Object).create(env)); - // const containsStatus = (list, selectedItems) => { - // return list.filter((item: any) => { if (selectedItems.indexOf(item.status) !== -1) return item; }); - // }; - - // config && (filteredData = filteredData.filter((item: any) => { - // const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1; - // const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active'); - // const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true; - - // const modifiedResources = containsStatus(item.resources, config.resources); - // let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true; - - // if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; } - // if (config.resources.length === 0 && config.type === 'active' || - // modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') { - // item.resources = modifiedResources; - // isResources = true; - // } - - // return isName && isStatus && isShape && isResources; - // })); + + const containsStatus = (list, selectedItems) => { + debugger; + return list.filter((item: any) => { if (selectedItems.indexOf(item.status) !== -1) return item; }); + }; + + config && (filteredData.forEach((project: any) => { + + + debugger; + + project.exploratory = project.exploratory.filter(item => { + + const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1; + const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active'); + const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true; + + const modifiedResources = containsStatus(item.resources, config.resources); + let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true; + + if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; } + + if (config.resources.length === 0 && config.type === 'active' || + modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') { + item.resources = modifiedResources; + isResources = true; + } + // && isResources + return isName && isStatus && isShape; + }) + })); config && this.updateUserPreferences(config); this.filteredEnvironments = filteredData; From 218245abbb90a5fb050dcfb7ddc22249c8c7774f Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Tue, 16 Jul 2019 17:20:56 +0300 Subject: [PATCH 341/357] [DLAB-867]: fixed issue with project edit --- .../project/project-list/project-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 449d0f8c06..9ae3c82de3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -63,7 +63,7 @@ + (click)="editProject(element)"> mode_edit From eb1148eec699aa6f6fda499263b884a82c1b277e Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 17 Jul 2019 10:09:50 +0300 Subject: [PATCH 342/357] Spark cluster configuration fails fixed EMR configuration fails fixed --- .../src/general/lib/aws/actions_lib.py | 12 ++++++------ .../aws/common_notebook_configure_dataengine.py | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py index d8e00f3bec..99767b5eae 100644 --- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py @@ -1365,13 +1365,13 @@ def create_image_from_instance(tag_name='', instance_name='', image_name='', tag def install_emr_spark(args): s3_client = boto3.client('s3', config=Config(signature_version='s3v4'), region_name=args.region) - s3_client.download_file(args.bucket, args.user_name + '/' + args.cluster_name + '/spark.tar.gz', + s3_client.download_file(args.bucket, args.project_name + '/' + args.cluster_name + '/spark.tar.gz', '/tmp/spark.tar.gz') - s3_client.download_file(args.bucket, args.user_name + '/' + args.cluster_name + '/spark-checksum.chk', + s3_client.download_file(args.bucket, args.project_name + '/' + args.cluster_name + '/spark-checksum.chk', '/tmp/spark-checksum.chk') if 'WARNING' in local('md5sum -c /tmp/spark-checksum.chk', capture=True): local('rm -f /tmp/spark.tar.gz') - s3_client.download_file(args.bucket, args.user_name + '/' + args.cluster_name + '/spark.tar.gz', + s3_client.download_file(args.bucket, args.project_name + '/' + args.cluster_name + '/spark.tar.gz', '/tmp/spark.tar.gz') if 'WARNING' in local('md5sum -c /tmp/spark-checksum.chk', capture=True): print("The checksum of spark.tar.gz is mismatched. It could be caused by aws network issue.") @@ -1403,9 +1403,9 @@ def yarn(args, yarn_dir): else: s3client = boto3.client('s3', config=Config(signature_version='s3v4'), region_name=args.region) s3resource = boto3.resource('s3', config=Config(signature_version='s3v4')) - get_files(s3client, s3resource, args.user_name + '/' + args.cluster_name + '/config/', args.bucket, yarn_dir) - local('sudo mv ' + yarn_dir + args.user_name + '/' + args.cluster_name + '/config/* ' + yarn_dir) - local('sudo rm -rf ' + yarn_dir + args.user_name + '/') + get_files(s3client, s3resource, args.project_name + '/' + args.cluster_name + '/config/', args.bucket, yarn_dir) + local('sudo mv ' + yarn_dir + args.project_name + '/' + args.cluster_name + '/config/* ' + yarn_dir) + local('sudo rm -rf ' + yarn_dir + args.project_name + '/') def get_files(s3client, s3resource, dist, bucket, local): diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py index efedcd8a63..c5a3573008 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py @@ -56,7 +56,6 @@ notebook_config['region'] = os.environ['aws_region'] notebook_config['tag_name'] = notebook_config['service_base_name'] + '-Tag' notebook_config['project_name'] = os.environ['project_name'] - notebook_config['project_tag'] = os.environ['project_tag'] notebook_config['cluster_name'] = notebook_config['service_base_name'] + '-' + notebook_config['project_name'] + \ '-de-' + notebook_config['exploratory_name'] + '-' + \ notebook_config['computational_name'] From 1533495a10f9b3676bea25bbbf1d7acd476218c7 Mon Sep 17 00:00:00 2001 From: bhliva Date: Wed, 17 Jul 2019 11:56:46 +0300 Subject: [PATCH 343/357] DLAB-903 changed error message in case when aws verification failed --- .../src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java | 2 +- .../epam/dlab/auth/service/impl/LdapAuthenticationService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java b/services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java index 3304dc5b83..d00436829c 100644 --- a/services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java +++ b/services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java @@ -64,7 +64,7 @@ public UserInfo getUserInfo(String username, String password) { return getUserInfo(username, password, connection.getBoundConnection()); } catch (Exception e) { log.error("Can not get user info for user {} due to: {}", username, e.getMessage()); - throw new DlabException("Can not get user info due to: " + e.getMessage(), e); + throw new DlabException("Username or password is invalid"); } } diff --git a/services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java b/services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java index b324cadefb..36dbe02332 100644 --- a/services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java +++ b/services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java @@ -63,7 +63,7 @@ public Optional login(UserCredentialDTO credentialDTO) { return StringUtils.isNoneBlank(token) ? getUserInfo(token) : getLdapUserInfo(credentialDTO); } catch (Exception e) { log.error("Error occurred during login for user {}: {}", credentialDTO.getUsername(), e.getMessage()); - throw new DlabAuthenticationException("Username or password is invalid"); + throw new DlabAuthenticationException(e.getMessage()); } } From bd25ef4bc37dd6d62a02d39d1affea85b14ac07b Mon Sep 17 00:00:00 2001 From: bhliva Date: Wed, 17 Jul 2019 12:48:47 +0300 Subject: [PATCH 344/357] DLAB-000 unit test fixed --- .../epam/dlab/module/aws/S3FileListTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/services/billing-aws/src/test/java/com/epam/dlab/module/aws/S3FileListTest.java b/services/billing-aws/src/test/java/com/epam/dlab/module/aws/S3FileListTest.java index f06135185c..56315b5e5e 100644 --- a/services/billing-aws/src/test/java/com/epam/dlab/module/aws/S3FileListTest.java +++ b/services/billing-aws/src/test/java/com/epam/dlab/module/aws/S3FileListTest.java @@ -52,15 +52,15 @@ public void sort() throws AdapterException { final ListObjectsV2Result result = mock(ListObjectsV2Result.class); final ModuleData moduleData = mock(ModuleData.class); final String[] array = { - "report-prefix/report/20160101-20160131/123456789/report-1.csv.zip", - "report-prefix/report/20160101-20160131/123456789/report-2.csv.zip", - "report-prefix/report/20160101-20160131/123456789/report-3.csv.zip", - "report-prefix/report/20160202-20160231/123456789/report.csv.zip", - "report-prefix/report/20160202-20160301/123456789/report.csv.zip", - "report-prefix/report/20160303-20160301/123456789/report-1.csv.zip", - "report-prefix/report/20160303-20160301/123456789/report-2.csv.zip", - "report-prefix/report/20160303-20160302/123456789/report-1.csv.zip", - "report-prefix/report/20160303-20160302/123456789/report-2.csv.zip" + "report-prefix/report/20160101-20160131/123456789/report-1.csv", + "report-prefix/report/20160101-20160131/123456789/report-2.csv", + "report-prefix/report/20160101-20160131/123456789/report-3.csv", + "report-prefix/report/20160202-20160231/123456789/report.csv", + "report-prefix/report/20160202-20160301/123456789/report.csv", + "report-prefix/report/20160303-20160301/123456789/report-1.csv", + "report-prefix/report/20160303-20160301/123456789/report-2.csv", + "report-prefix/report/20160303-20160302/123456789/report-1.csv", + "report-prefix/report/20160303-20160302/123456789/report-2.csv" }; final List objectSummaries = Arrays.asList( getObjectSummary(array[0], LocalDate.of(2018, 4, 4)), From 78a5ef7c2cb50e2aafee62ecdc38713ed658ee05 Mon Sep 17 00:00:00 2001 From: Mykola_Bodnar1 Date: Wed, 17 Jul 2019 12:52:30 +0300 Subject: [PATCH 345/357] IAM user requirement for GCP added --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fdad3d01eb..3058e8d54b 100644 --- a/README.md +++ b/README.md @@ -342,6 +342,7 @@ Prerequisites: Prerequisites: +- IAM user - Service account and JSON auth file for it. In order to get JSON auth file, Key should be created for service account through Google cloud console. - Google Cloud Storage JSON API should be enabled From e2ad8736f2892ababf135db187e773389f9e7ff8 Mon Sep 17 00:00:00 2001 From: bhliva Date: Wed, 17 Jul 2019 15:00:32 +0300 Subject: [PATCH 346/357] DLAB-000 unit test fixed --- .../impl/EnvironmentServiceImplTest.java | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java index 5d637247fa..f651c92e56 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java @@ -25,19 +25,15 @@ import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.dao.KeyDAO; import com.epam.dlab.backendapi.dao.UserSettingsDAO; -import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.resources.dto.UserDTO; -import com.epam.dlab.backendapi.resources.dto.UserResourceInfo; import com.epam.dlab.backendapi.service.ComputationalService; import com.epam.dlab.backendapi.service.EdgeService; import com.epam.dlab.backendapi.service.ExploratoryService; import com.epam.dlab.backendapi.service.ProjectService; import com.epam.dlab.dto.UserInstanceDTO; import com.epam.dlab.dto.UserInstanceStatus; -import com.epam.dlab.dto.base.edge.EdgeInfo; import com.epam.dlab.exceptions.DlabException; import com.epam.dlab.exceptions.ResourceConflictException; -import com.epam.dlab.model.ResourceEnum; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -138,40 +134,6 @@ public void getAllUsersWithException() { environmentService.getUserNames(); } - @Test - public void getAllEnv() { - List instances = getUserInstances(); - final ProjectDTO project = new ProjectDTO("prj", Collections.emptySet(), Collections.emptySet(), - "key", "tag", null); - project.setEdgeInfo(new EdgeInfo()); - when(exploratoryDAO.getInstances()).thenReturn(instances); - doReturn(Collections.singletonList(project)).when(projectService).getProjectsWithStatus(ProjectDTO.Status.ACTIVE); - - EdgeInfo edgeInfo = new EdgeInfo(); - edgeInfo.setEdgeStatus("running"); - edgeInfo.setInstanceId("someId"); - when(keyDAO.getEdgeInfo(anyString())).thenReturn(edgeInfo); - - UserResourceInfo edgeResource = new UserResourceInfo().withResourceType(ResourceEnum.EDGE_NODE) - .withResourceStatus(edgeInfo.getEdgeStatus()).withUser(USER); - - UserResourceInfo notebook1 = new UserResourceInfo().withResourceType(ResourceEnum.NOTEBOOK) - .withResourceName(instances.get(0).getExploratoryName()) - .withResourceStatus(instances.get(0).getStatus()).withUser(instances.get(0) - .getUser()); - UserResourceInfo notebook2 = new UserResourceInfo().withResourceType(ResourceEnum.NOTEBOOK) - .withResourceName(instances.get(1).getExploratoryName()) - .withResourceStatus(instances.get(1).getStatus()).withUser(instances.get(1) - .getUser()); - - List actualEnv = environmentService.getAllEnv(); - assertEquals(3, actualEnv.size()); - - verify(exploratoryDAO).getInstances(); - verify(projectService).getProjectsWithStatus(ProjectDTO.Status.ACTIVE); - verifyNoMoreInteractions(exploratoryDAO, envDAO, keyDAO); - } - @Test public void stopAll() { doReturn(Collections.singleton(USER)).when(envDAO).fetchAllUsers(); From 0e469d25ae2c1eb0a4d27a4abc925bb633b7babe Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 17 Jul 2019 15:15:27 +0300 Subject: [PATCH 347/357] [DLAB-867]: fixed grid layout wrapping --- .../webapp/src/app/resources/resources.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index 3020738ee9..7595650501 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
    +
    +
    From 7e312597eeca8250108effc33d949e636068449e Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 17 Jul 2019 15:17:32 +0300 Subject: [PATCH 348/357] [DLAB-867]: spliced project out of filtered data if no matched resources --- .../resources-grid.component.html | 4 +- .../resources-grid.component.ts | 72 +++++++++---------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html index bda825c27e..62c102284f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html @@ -157,8 +157,8 @@ - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index a3ec44cd26..a964b52dd1 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -117,20 +117,21 @@ export class ResourcesGridComponent implements OnInit { // PRIVATE + private getEnvironmentsListCopy() { + return this.environments.map(env => JSON.parse(JSON.stringify(env))); + } + private getDefaultFilterConfiguration(): void { const data: Exploratory[] = this.environments; const shapes = [], statuses = [], resources = []; - data.filter(elem => elem.exploratory.forEach((item: any) => { - if (shapes.indexOf(item.shape) === -1) - shapes.push(item.shape); - if (statuses.indexOf(item.status) === -1) - statuses.push(item.status); + data.filter(elem => elem.exploratory.map((item: any) => { + if (shapes.indexOf(item.shape) === -1) shapes.push(item.shape); + if (statuses.indexOf(item.status) === -1) statuses.push(item.status); statuses.sort(SortUtils.statusSort); - item.resources.forEach((resource: any) => { - if (resources.indexOf(resource.status) === -1) - resources.push(resource.status); + item.resources.map((resource: any) => { + if (resources.indexOf(resource.status) === -1) resources.push(resource.status); resources.sort(SortUtils.statusSort); }); })); @@ -138,56 +139,47 @@ export class ResourcesGridComponent implements OnInit { this.filterConfiguration = new FilterConfigurationModel('', statuses, shapes, resources, ''); } - - - private getEnvironmentsListCopy() { - // let filteredData: any = this.environments.map(env => (Object).create(env)); - return this.environments.map(env => JSON.parse(JSON.stringify(env))); - } - - - - - applyFilter_btnClick(config: FilterConfigurationModel) { + private applyFilter_btnClick(config: FilterConfigurationModel) { this.filtering = true; let filteredData = this.getEnvironmentsListCopy(); const containsStatus = (list, selectedItems) => { - debugger; return list.filter((item: any) => { if (selectedItems.indexOf(item.status) !== -1) return item; }); }; - config && (filteredData.forEach((project: any) => { - - - debugger; + if (config) + filteredData = filteredData.filter(project => { + project.exploratory = project.exploratory.filter(item => { - project.exploratory = project.exploratory.filter(item => { + const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1; + const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active'); + const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true; - const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1; - const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active'); - const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true; + const modifiedResources = containsStatus(item.resources, config.resources); + let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true; - const modifiedResources = containsStatus(item.resources, config.resources); - let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true; + if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; } - if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; } + if (config.resources.length === 0 && config.type === 'active' || + modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') { + item.resources = modifiedResources; + isResources = true; + } - if (config.resources.length === 0 && config.type === 'active' || - modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') { - item.resources = modifiedResources; - isResources = true; - } - // && isResources - return isName && isStatus && isShape; - }) - })); + return isName && isStatus && isShape && isResources; + }); + return project.exploratory.length > 0; + }); config && this.updateUserPreferences(config); this.filteredEnvironments = filteredData; } + + + + showActiveInstances(): void { this.filterForm = this.loadUserPreferences(this.filterActiveInstances()); this.applyFilter_btnClick(this.filterForm); From 8e8182741260b29db28b94dd867b397c7c1fd564 Mon Sep 17 00:00:00 2001 From: Andriana Kovalyshyn Date: Wed, 17 Jul 2019 17:48:06 +0300 Subject: [PATCH 349/357] [DLAB-867]: prevent active filtering if no data available --- .../resources/resources-grid/resources-grid.component.scss | 4 ++-- .../webapp/src/app/resources/resources.component.html | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss index b984844456..90ce1bded8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss @@ -71,7 +71,7 @@ table { } .resources-col { - width: 30%; + width: 28%; padding: 5px; } @@ -82,7 +82,7 @@ table { } .actions-col { - width: 8%; + width: 10%; padding-right: 24px; text-align: right; } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index 7595650501..3342b616ce 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -29,7 +29,8 @@ - @@ -129,9 +129,7 @@ - - @@ -182,19 +180,24 @@
    - + + + To start working, please, create new environment + + - + - + diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts index a964b52dd1..65b31adf6b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts @@ -58,6 +58,10 @@ export class ResourcesGridComponent implements OnInit { environments: Exploratory[]; forse: boolean = true; + + collapsedFilterRow: boolean = false; + + filteredEnvironments: Exploratory[] = []; filterConfiguration: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); filterForm: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], ''); @@ -78,10 +82,8 @@ export class ResourcesGridComponent implements OnInit { - - isOutscreenDropdown: boolean; - collapseFilterRow: boolean = false; + filtering: boolean = false; activeFiltering: boolean = false; healthStatus: GeneralEnvironmentStatus; @@ -111,7 +113,7 @@ export class ResourcesGridComponent implements OnInit { } public toggleFilterRow(): void { - this.collapseFilterRow = !this.collapseFilterRow; + this.collapsedFilterRow = !this.collapsedFilterRow; } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index 3342b616ce..7595650501 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -29,8 +29,7 @@ -