[incubator-dlab] branch DLAB-599 updated: create ssn subnet in chosen zone
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a commit to branch DLAB-599 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/DLAB-599 by this push: new 970b474 create ssn subnet in chosen zone 970b474 is described below commit 970b47429a06f3b64500ecf27f655672abec6da5 Author: Oleksandr_Isniuk AuthorDate: Fri Apr 12 17:51:02 2019 +0300 create ssn subnet in chosen zone --- infrastructure-provisioning/src/general/conf/dlab.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini index 2536b00..94562f8 100644 --- a/infrastructure-provisioning/src/general/conf/dlab.ini +++ b/infrastructure-provisioning/src/general/conf/dlab.ini @@ -97,7 +97,7 @@ edge_instance_size = t2.medium ### Amazon region name for whole dlab provisioning region = us-west-2 ### Amazon zone letter for ssn, edge and notebook subnet provisioning -# zone = a +zone = a ### Amazon ami name based on debian conf_os_family for all dlab instances debian_image_name = ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20190212 ### Amazon ami name based on RedHat conf_os_family for all dlab instances - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: create ssn subnet in chosen zone
This is an automated email from the ASF dual-hosted git repository.
ioleksandr pushed a commit to branch DLAB-599
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 709033c13ea1d0ee6db30e43107f37a9bb96c61f
Author: Oleksandr_Isniuk
AuthorDate: Fri Apr 12 17:15:39 2019 +0300
create ssn subnet in chosen zone
---
infrastructure-provisioning/src/general/conf/dlab.ini| 2 ++
.../src/general/lib/aws/actions_lib.py | 16 ++--
.../src/general/scripts/aws/common_create_subnet.py | 3 ++-
.../src/general/scripts/aws/ssn_prepare.py | 11 ++-
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini
b/infrastructure-provisioning/src/general/conf/dlab.ini
index 58175fd..2536b00 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -96,6 +96,8 @@ ssn_instance_size = t2.large
edge_instance_size = t2.medium
### Amazon region name for whole dlab provisioning
region = us-west-2
+### Amazon zone letter for ssn, edge and notebook subnet provisioning
+# zone = a
### Amazon ami name based on debian conf_os_family for all dlab instances
debian_image_name =
ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20190212
### Amazon ami name based on RedHat conf_os_family for all dlab instances
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index f6f37d0..54b6900 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -243,10 +243,13 @@ def create_rt(vpc_id, infra_tag_name, infra_tag_value,
secondary):
traceback.print_exc(file=sys.stdout)
-def create_subnet(vpc_id, subnet, tag):
+def create_subnet(vpc_id, subnet, tag, zone):
try:
ec2 = boto3.resource('ec2')
-subnet = ec2.create_subnet(VpcId=vpc_id, CidrBlock=subnet)
+if zone == "":
+subnet = ec2.create_subnet(VpcId=vpc_id, CidrBlock=subnet,
AvailabilityZone=zone)
+else:
+subnet = ec2.create_subnet(VpcId=vpc_id, CidrBlock=subnet)
create_tag(subnet.id, tag)
subnet.reload()
return subnet.id
@@ -438,6 +441,15 @@ def create_instance(definitions, instance_tag,
primary_disk_size=12):
SubnetId=definitions.subnet_id,
IamInstanceProfile={'Name':
definitions.iam_profile},
UserData=user_data)
+elif definitions.instance_class == 'ssn':
+get_iam_profile(definitions.iam_profile)
+instances = ec2.create_instances(ImageId=definitions.ami_id,
MinCount=1, MaxCount=1,
+ KeyName=definitions.key_name,
+
SecurityGroupIds=security_groups_ids,
+
InstanceType=definitions.instance_type,
+ SubnetId=definitions.subnet_id,
+ IamInstanceProfile={'Name':
definitions.iam_profile},
+ UserData=user_data)
else:
get_iam_profile(definitions.iam_profile)
instances = ec2.create_instances(ImageId=definitions.ami_id,
MinCount=1, MaxCount=1,
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/common_create_subnet.py
b/infrastructure-provisioning/src/general/scripts/aws/common_create_subnet.py
index bd18cdc..889434a 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/common_create_subnet.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/common_create_subnet.py
@@ -39,6 +39,7 @@ parser.add_argument('--infra_tag_value', type=str, default='')
parser.add_argument('--prefix', type=str, default='')
parser.add_argument('--ssn', type=bool, default=False)
parser.add_argument('--user_subnets_range', type=str, default='')
+parser.add_argument('--zone', type=str, default='')
args = parser.parse_args()
@@ -122,7 +123,7 @@ if __name__ == "__main__":
if subnet_id == '':
print("Creating subnet {0} in vpc {1} with tag {2}".
format(dlab_subnet_cidr, args.vpc_id, json.dumps(tag)))
-subnet_id = create_subnet(args.vpc_id, dlab_subnet_cidr, tag)
+subnet_id = create_subnet(args.vpc_id, dlab_subnet_cidr, tag,
args.zone)
else:
print("REQUESTED SUBNET ALREADY EXISTS. USING CIDR
{}".format(subnet_check))
subnet_id = get_subnet_by_cidr(subnet_check)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
[incubator-dlab] branch DLAB-599 created (now 709033c)
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a change to branch DLAB-599 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 709033c create ssn subnet in chosen zone This branch includes the following new commits: new 709033c create ssn subnet in chosen zone The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #97 from apache/DLAB-572
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit b990cac7c1c5ee00428fa7c1c51e924275178817 Merge: 55cd899 652e3eb Author: bhliva AuthorDate: Fri Apr 12 16:17:50 2019 +0300 Merge pull request #97 from apache/DLAB-572 [DLAB-572]: added handler on edge creation failing; app metadata added .../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 16 +- .../callback/base/KeyUploaderCallback.java | 5 +- .../src/main/resources/webapp/angular.json | 23 - .../src/main/resources/webapp/package-lock.json| 527 - .../src/main/resources/webapp/package.json | 4 +- .../services/applicationServiceFacade.service.ts | 9 + .../src/app/core/services/healthStatus.service.ts | 8 + .../resources/webapp/src/app/management/index.ts | 6 +- .../manage-environment-dilog.component.ts | 4 +- .../management-grid/management-grid.component.html | 38 +- .../management-grid/management-grid.component.scss | 3 + .../management-grid/management-grid.component.ts | 8 +- .../src/app/management/management.component.ts | 4 +- .../webapp/src/app/management/management.model.ts | 3 +- .../webapp/src/app/shared/navbar/index.ts | 5 +- .../src/app/shared/navbar/navbar.component.html| 9 + .../src/app/shared/navbar/navbar.component.scss| 20 +- .../src/app/shared/navbar/navbar.component.ts | 19 +- .../main/resources/webapp/src/tsconfig.spec.json | 20 + .../src/main/resources/webapp/tslint.json | 1 - 20 files changed, 214 insertions(+), 518 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (55cd899 -> b990cac)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 55cd899 Merge pull request #96 from Dyoma33/DLAB-580 add e4d5dd4 DLAB-570 fixed bug connected with wrong key status in case of fail add 7d37d3c Merge branch 'bugfix-DLAB-570' of github.com:apache/incubator-dlab into DLAB-572 add 4e21daa [DLAB-572]: added handler on edge creation failing; app version added add 76c8a67 [DLAB-572]: linter configuration updates add 87e5ba8 DLAB-572 added status to health status page in case of edge is not exist add 652e3eb [DLAB-583]: added meta data service new b990cac Merge pull request #97 from apache/DLAB-572 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 16 +- .../callback/base/KeyUploaderCallback.java | 5 +- .../src/main/resources/webapp/angular.json | 23 - .../src/main/resources/webapp/package-lock.json| 527 - .../src/main/resources/webapp/package.json | 4 +- .../services/applicationServiceFacade.service.ts | 9 + .../src/app/core/services/healthStatus.service.ts | 8 + .../resources/webapp/src/app/management/index.ts | 6 +- .../manage-environment-dilog.component.ts | 4 +- .../management-grid/management-grid.component.html | 38 +- .../management-grid/management-grid.component.scss | 3 + .../management-grid/management-grid.component.ts | 8 +- .../src/app/management/management.component.ts | 4 +- .../webapp/src/app/management/management.model.ts | 3 +- .../webapp/src/app/shared/navbar/index.ts | 5 +- .../src/app/shared/navbar/navbar.component.html| 9 + .../src/app/shared/navbar/navbar.component.scss| 20 +- .../src/app/shared/navbar/navbar.component.ts | 19 +- .../main/resources/webapp/src/tsconfig.spec.json | 20 + .../src/main/resources/webapp/tslint.json | 1 - 20 files changed, 214 insertions(+), 518 deletions(-) create mode 100644 services/self-service/src/main/resources/webapp/src/tsconfig.spec.json - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-572 deleted (was 652e3eb)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch DLAB-572 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was 652e3eb [DLAB-583]: added meta data service The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-572 updated: [DLAB-583]: added meta data service
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-572 by this push:
new 652e3eb [DLAB-583]: added meta data service
652e3eb is described below
commit 652e3eb3c62815273870baed9381aad46db22f7a
Author: Andriana Kovalyshyn
AuthorDate: Fri Apr 12 16:08:29 2019 +0300
[DLAB-583]: added meta data service
---
.../resources/webapp/src/app/shared/navbar/navbar.component.html | 9 -
.../resources/webapp/src/app/shared/navbar/navbar.component.scss | 5 +++--
.../resources/webapp/src/app/shared/navbar/navbar.component.ts | 4 +++-
3 files changed, 10 insertions(+), 8 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 938473c..d13c23e 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
@@ -42,14 +42,13 @@
radio_button_checked
-
-
- share
+
+ share
- Version: {{ metadata?.version | - }}
- Branch {{ metadata?.branch | - }}
+ Version: {{ metadata?.version }}
+ Branch: {{ metadata?.branch }}
Log out {{currentUserName}}
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 b6bc96f..e79d196 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
@@ -69,7 +69,8 @@
color: #bd4146;
}
}
- .info {
+ .meta {
+color: #fff;
&:hover {
color: #c7d4d6;
}
@@ -133,7 +134,7 @@ a.nav-item {
}
}
-.ok, .warning, .error, .user-name {
+.ok, .warning, .error, .user-name, .meta {
transition: all .35s 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 d924fb1..21938f9 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
@@ -197,7 +197,9 @@ export class NavbarComponent implements OnInit, OnDestroy {
}
public checkVersionData(): void {
-this.healthStatusService.getAppMetaData().subscribe(res => this.metadata =
res);
+this.healthStatusService.getAppMetaData().subscribe(
+ result => this.metadata = result || null,
+ error => console.log(error));
}
private selectQuotesAlert(type: string, user_quota?: number, total_quota?:
number): string {
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated: [DLAB-580] Removed n1-standard-1 shape from Dataproc jenkins job
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/develop by this push: new 4c04126 [DLAB-580] Removed n1-standard-1 shape from Dataproc jenkins job new 55cd899 Merge pull request #96 from Dyoma33/DLAB-580 4c04126 is described below commit 4c04126d44dd073ff9e099b36696c9eedee98a5d Author: Dyoma33 AuthorDate: Fri Apr 12 14:20:20 2019 +0300 [DLAB-580] Removed n1-standard-1 shape from Dataproc jenkins job --- .../templates/gcp/jenkins_jobs/create_dataengine-service/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/create_dataengine-service/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/create_dataengine-service/config.xml index 29547eb..a1d2393 100644 --- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/create_dataengine-service/config.xml +++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/create_dataengine-service/config.xml @@ -49,12 +49,12 @@ under the License. master_instance_type Shape of master node - n1-standard-1 + n1-standard-2 slave_instance_type Shape of slave nodes - n1-standard-1 + n1-standard-2 master_count - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-572 updated: DLAB-572 added status to health status page in case of edge is not exist
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-572 by this push:
new 87e5ba8 DLAB-572 added status to health status page in case of edge
is not exist
87e5ba8 is described below
commit 87e5ba85d42fe11c3285bc84ebc2c10dfc34cecc
Author: bhliva
AuthorDate: Fri Apr 12 14:37:36 2019 +0300
DLAB-572 added status to health status page in case of edge is not exist
---
.../main/java/com/epam/dlab/backendapi/dao/EnvDAO.java | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
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 8d27fff..703586a 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
@@ -153,29 +153,31 @@ public class EnvDAO extends BaseDAO {
}
/**
-* Finds and returns the of computational resource.
-*
* @param user the name of user.
* @param fullReport return full report if true otherwise common
status only.
* @throws DlabException in case of any exception
*/
public HealthStatusPageDTO getHealthStatusPageDTO(String user, boolean
fullReport) {
- List listResource = new ArrayList<>();
+ List listResource = new ArrayList<>(1);
final HealthStatusPageDTO healthStatusPageDTO = new
HealthStatusPageDTO()
.withStatus(HealthStatusEnum.OK);
- getEdgeNode(user).ifPresent(edge -> {
- final String edgeStatus = edge.getString(EDGE_STATUS);
+ final Optional edgeNode = getEdgeNode(user);
+ if (edgeNode.isPresent()) {
+ final Document document = edgeNode.get();
+ final String edgeStatus =
document.getString(EDGE_STATUS);
if (UserInstanceStatus.RUNNING !=
UserInstanceStatus.of(edgeStatus)) {
healthStatusPageDTO.withStatus(HealthStatusEnum.ERROR);
}
if (fullReport) {
listResource.add(new HealthStatusResource()
.withType("Edge Node")
-
.withResourceId(edge.getString(EDGE_PUBLIC_IP))
+
.withResourceId(document.getString(EDGE_PUBLIC_IP))
.withStatus(edgeStatus));
}
- });
+ } else {
+ healthStatusPageDTO.withStatus(HealthStatusEnum.ERROR);
+ }
return healthStatusPageDTO
.withListResources(fullReport ? listResource :
null);
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/03: [DLAB-572]: added handler on edge creation failing; app version added
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4e21daad433f65e8afb2665a421b6fc977aebc7f
Author: Andriana Kovalyshyn
AuthorDate: Fri Apr 12 14:08:47 2019 +0300
[DLAB-572]: added handler on edge creation failing; app version added
---
.../services/applicationServiceFacade.service.ts | 9 +
.../src/app/core/services/healthStatus.service.ts | 8 +
.../resources/webapp/src/app/management/index.ts | 6 ++--
.../manage-environment-dilog.component.ts | 4 +--
.../management-grid/management-grid.component.html | 38 +++---
.../management-grid/management-grid.component.scss | 3 ++
.../management-grid/management-grid.component.ts | 8 ++---
.../src/app/management/management.component.ts | 4 +--
.../webapp/src/app/management/management.model.ts | 3 +-
.../webapp/src/app/shared/navbar/index.ts | 5 +--
.../src/app/shared/navbar/navbar.component.html| 10 ++
.../src/app/shared/navbar/navbar.component.scss| 17 +-
.../src/app/shared/navbar/navbar.component.ts | 17 +++---
13 files changed, 93 insertions(+), 39 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 b1fd570..79ae239 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
@@ -49,6 +49,7 @@ export class ApplicationServiceFacade {
private static readonly USER_PREFERENCES = 'user_preferences';
private static readonly BUDGET = 'budget';
private static readonly ENVIRONMENT_HEALTH_STATUS =
'environment_health_status';
+ private static readonly META_DATA = 'meta';
private static readonly ROLES = 'roles';
private static readonly GROUPS = 'groups';
private static readonly GROUP_ROLE = 'group_role';
@@ -514,6 +515,12 @@ export class ApplicationServiceFacade {
data);
}
+ public buildGetAppMetaData(): Observable {
+return this.buildRequest(RequestMethod.Get,
+ this.requestRegistry.Item(ApplicationServiceFacade.META_DATA),
+ null);
+ }
+
private setupRegistry(): void {
this.requestRegistry = new Dictionary();
@@ -559,6 +566,8 @@ export class ApplicationServiceFacade {
// Environment Health Status
this.requestRegistry.Add(ApplicationServiceFacade.ENVIRONMENT_HEALTH_STATUS,
'/api/infrastructure/status');
+
this.requestRegistry.Add(ApplicationServiceFacade.ENVIRONMENT_HEALTH_STATUS,
'/api/infrastructure/status');
+this.requestRegistry.Add(ApplicationServiceFacade.META_DATA,
'/api/infrastructure/meta');
this.requestRegistry.Add(ApplicationServiceFacade.EDGE_NODE_START,
'/api/infrastructure/edge/start');
this.requestRegistry.Add(ApplicationServiceFacade.EDGE_NODE_STOP,
'/api/infrastructure/edge/stop');
this.requestRegistry.Add(ApplicationServiceFacade.EDGE_NODE_RECREATE,
'/api/user/access_key/recover');
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 f891dfc..545c481 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
@@ -176,6 +176,14 @@ export class HealthStatusService {
catchError(error => error));
}
+ public getAppMetaData(): Observable<{}> {
+return this.applicationServiceFacade
+ .buildGetAppMetaData()
+ .pipe(
+map(response => response),
+catchError(error => error));
+ }
+
public resetStatusValue() {
this._statusData.next({});
}
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
index b46ea96..d49689c 100644
---
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
@@ -33,7 +33,7 @@ import { MaterialModule } from '../shared/material.module';
import { ManagementComponent } from './management.component';
import {
ManagementGridComponent,
- ConfirmationDialog
+ ConfirmationDialogComponent
} from './management-grid/management-grid.component';
import { ComputationalResourcesModule } from
'../resources/computational/computational-resources-list';
@@ -77,13 +77,13 @@ export * from './management.component';
GroupNameValidationDirective,
BackupDilogCompone
[incubator-dlab] 03/03: [DLAB-572]: linter configuration updates
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 76c8a672eaa035331b72ec7de10cfbc98c989a9b
Author: Andriana Kovalyshyn
AuthorDate: Fri Apr 12 14:09:49 2019 +0300
[DLAB-572]: linter configuration updates
---
.../src/main/resources/webapp/angular.json | 23 -
.../src/main/resources/webapp/package-lock.json| 527 -
.../src/main/resources/webapp/package.json | 4 +-
.../main/resources/webapp/src/tsconfig.spec.json | 20 +
.../src/main/resources/webapp/tslint.json | 1 -
5 files changed, 107 insertions(+), 468 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/angular.json
b/services/self-service/src/main/resources/webapp/angular.json
index 37eef6d..7969eb8 100644
--- a/services/self-service/src/main/resources/webapp/angular.json
+++ b/services/self-service/src/main/resources/webapp/angular.json
@@ -98,29 +98,6 @@
}
}
}
-},
-"webapp-e2e": {
- "root": "e2e",
- "sourceRoot": "e2e",
- "projectType": "application",
- "architect": {
-"e2e": {
- "builder": "@angular-devkit/build-angular:protractor",
- "options": {
-"protractorConfig": "./protractor.conf.js",
-"devServerTarget": "webapp:serve"
- }
-},
-"lint": {
- "builder": "@angular-devkit/build-angular:tslint",
- "options": {
-"tsConfig": [
- "e2e/tsconfig.e2e.json"
-],
-"exclude": []
- }
-}
- }
}
},
"defaultProject": "webapp",
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 e2afedc..9e0f215 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -1903,37 +1903,6 @@
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
"dev": true
},
-"ansi-align": {
- "version": "1.1.0",
- "resolved":
"https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";,
- "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
- "dev": true,
- "requires": {
-"string-width": "1.0.2"
- },
- "dependencies": {
-"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=",
- "dev": true,
- "requires": {
-"number-is-nan": "1.0.1"
- }
-},
-"string-width": {
- "version": "1.0.2",
- "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",
-"is-fullwidth-code-point": "1.0.0",
-"strip-ansi": "3.0.1"
- }
-}
- }
-},
"ansi-colors": {
"version": "3.2.3",
"resolved":
"https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz";,
@@ -1981,9 +1950,9 @@
}
},
"app-root-path": {
- "version": "2.0.1",
- "resolved":
"https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz";,
- "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=",
+ "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": {
@@ -2526,45 +2495,6 @@
"hoek": "4.2.0"
}
},
-"boxen": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";,
- "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
- "dev": true,
- "requires": {
-"ansi-align": "1.1.0",
-"camelcase": "2.1.1",
-"chalk": "1.1.3",
-"cli-boxes": "1.0.0",
-"filled-array": "1.1.0",
-"object-assign": "4.1.1",
-"repeating": "2.0.1",
-"string-width": "1.0.2",
-"widest-line": "1.0.0"
- },
- "dependencies": {
-"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=",
- "dev": true,
- "requires": {
-"number-is-nan": "1.0.1"
- }
-},
-"string-width": {
- "version": "1.0.2",
- "resolved":
"https://registry.npmjs.org/s
[incubator-dlab] 01/03: Merge branch 'bugfix-DLAB-570' of github.com:apache/incubator-dlab into DLAB-572
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-572 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 7d37d3c5f14298d0e6ef59e77f03ce7bd206e6c0 Merge: 8dae908 e4d5dd4 Author: Andriana Kovalyshyn AuthorDate: Thu Apr 11 17:27:46 2019 +0300 Merge branch 'bugfix-DLAB-570' of github.com:apache/incubator-dlab into DLAB-572 .../dlab/backendapi/resources/callback/base/KeyUploaderCallback.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-572 created (now 76c8a67)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-572 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 76c8a67 [DLAB-572]: linter configuration updates This branch includes the following new commits: new 7d37d3c Merge branch 'bugfix-DLAB-570' of github.com:apache/incubator-dlab into DLAB-572 new 4e21daa [DLAB-572]: added handler on edge creation failing; app version added new 76c8a67 [DLAB-572]: linter configuration updates The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch bugfix-DLAB-602-1 deleted (was bbf373e)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch bugfix-DLAB-602-1 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was bbf373e DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #95 from apache/bugfix-DLAB-602-1
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit b6e7f8aa27430e6b9cea997bfc50ae48bd169f1f Merge: 4bfaf01 bbf373e Author: bhliva AuthorDate: Fri Apr 12 12:58:19 2019 +0300 Merge pull request #95 from apache/bugfix-DLAB-602-1 DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered .../main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java | 4 .../epam/dlab/auth/service/impl/LdapAuthenticationService.java | 10 -- 2 files changed, 8 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (4bfaf01 -> b6e7f8a)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 4bfaf01 Merge pull request #94 from apache/DLAB-592 add bbf373e DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered new b6e7f8a Merge pull request #95 from apache/bugfix-DLAB-602-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java | 4 .../epam/dlab/auth/service/impl/LdapAuthenticationService.java | 10 -- 2 files changed, 8 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch bugfix-DLAB-602 deleted (was d7d9757)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch bugfix-DLAB-602 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was d7d9757 DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered This change permanently discards the following revisions: discard d7d9757 DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered discard 1ae0eb5 Merge remote-tracking branch 'origin/develop' into develop - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch bugfix-DLAB-602-1 created (now bbf373e)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch bugfix-DLAB-602-1 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at bbf373e DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered This branch includes the following new commits: new bbf373e DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch bugfix-DLAB-602-1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit bbf373e66741a07b8a3b798631be6983639a7ea5
Author: bhliva
AuthorDate: Fri Apr 12 12:51:13 2019 +0300
DLAB-602 fixed bug connected with wrong error message in case of wrong user
login entered
---
.../main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java | 4
.../epam/dlab/auth/service/impl/LdapAuthenticationService.java | 10 --
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
b/services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
index 845c73a..647e46e 100644
---
a/services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
+++
b/services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
@@ -74,7 +74,6 @@ public class UserInfoDAOMongoImpl implements UserInfoDAO {
@Override
public void deleteUserInfo(String accessToken) {
- //delete used in logout and has to be synchronized
BasicDBObject uiDoc = new BasicDBObject();
uiDoc.put("_id", accessToken);
MongoCollection security =
ms.getCollection(SECURITY_COLLECTION, BasicDBObject.class);
@@ -84,9 +83,6 @@ public class UserInfoDAOMongoImpl implements UserInfoDAO {
@Override
public void saveUserInfo(UserInfo ui) {
- //UserInfo first cached and immediately becomes available
- //Saving can be asynch
-
BasicDBObject uiDoc = new BasicDBObject();
uiDoc.put("_id", ui.getAccessToken());
uiDoc.put("name", ui.getName());
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 3271558..b324cad 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
@@ -25,6 +25,7 @@ import com.epam.dlab.auth.UserVerificationService;
import com.epam.dlab.auth.dao.LdapUserDAO;
import com.epam.dlab.auth.dto.UserCredentialDTO;
import com.epam.dlab.auth.service.AuthenticationService;
+import com.epam.dlab.exceptions.DlabAuthenticationException;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
@@ -57,8 +58,13 @@ public class LdapAuthenticationService implements
AuthenticationService {
@Override
public Optional login(UserCredentialDTO credentialDTO) {
- final String token = credentialDTO.getAccessToken();
- return StringUtils.isNoneBlank(token) ? getUserInfo(token) :
getLdapUserInfo(credentialDTO);
+ try {
+ final String token = credentialDTO.getAccessToken();
+ 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");
+ }
}
@Override
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/02: DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch bugfix-DLAB-602
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d7d9757ece309343d92f1b171a5351341a2b57d1
Author: bhliva
AuthorDate: Fri Apr 12 12:51:13 2019 +0300
DLAB-602 fixed bug connected with wrong error message in case of wrong user
login entered
---
.../main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java | 4
.../epam/dlab/auth/service/impl/LdapAuthenticationService.java | 10 --
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
b/services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
index 845c73a..647e46e 100644
---
a/services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
+++
b/services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
@@ -74,7 +74,6 @@ public class UserInfoDAOMongoImpl implements UserInfoDAO {
@Override
public void deleteUserInfo(String accessToken) {
- //delete used in logout and has to be synchronized
BasicDBObject uiDoc = new BasicDBObject();
uiDoc.put("_id", accessToken);
MongoCollection security =
ms.getCollection(SECURITY_COLLECTION, BasicDBObject.class);
@@ -84,9 +83,6 @@ public class UserInfoDAOMongoImpl implements UserInfoDAO {
@Override
public void saveUserInfo(UserInfo ui) {
- //UserInfo first cached and immediately becomes available
- //Saving can be asynch
-
BasicDBObject uiDoc = new BasicDBObject();
uiDoc.put("_id", ui.getAccessToken());
uiDoc.put("name", ui.getName());
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 3271558..b324cad 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
@@ -25,6 +25,7 @@ import com.epam.dlab.auth.UserVerificationService;
import com.epam.dlab.auth.dao.LdapUserDAO;
import com.epam.dlab.auth.dto.UserCredentialDTO;
import com.epam.dlab.auth.service.AuthenticationService;
+import com.epam.dlab.exceptions.DlabAuthenticationException;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
@@ -57,8 +58,13 @@ public class LdapAuthenticationService implements
AuthenticationService {
@Override
public Optional login(UserCredentialDTO credentialDTO) {
- final String token = credentialDTO.getAccessToken();
- return StringUtils.isNoneBlank(token) ? getUserInfo(token) :
getLdapUserInfo(credentialDTO);
+ try {
+ final String token = credentialDTO.getAccessToken();
+ 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");
+ }
}
@Override
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch bugfix-DLAB-602 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 1ae0eb5056439b0c01cdbe4cb7ada3b59e310620 Merge: 216a632 4bfaf01 Author: bhliva AuthorDate: Fri Apr 12 12:04:57 2019 +0300 Merge remote-tracking branch 'origin/develop' into develop .../general/files/gcp/dataengine-service_description.json | 4 ++-- .../src/general/lib/aws/actions_lib.py | 6 ++ .../general/scripts/gcp/dataengine-service_jars_parser.py | 14 +++--- 3 files changed, 15 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch bugfix-DLAB-602 created (now d7d9757)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch bugfix-DLAB-602 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at d7d9757 DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered This branch includes the following new commits: new 1ae0eb5 Merge remote-tracking branch 'origin/develop' into develop new d7d9757 DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
