This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1546 by this push:
new e8dc4ad [DLAB-1546]: added name convention changes
e8dc4ad is described below
commit e8dc4ada920854cd81297cd3d92685b6b27f6625
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Feb 25 16:24:45 2020 +0200
[DLAB-1546]: added name convention changes
---
.../scripts/deploy_repository/deploy_repository.py | 2 +-
.../src/general/lib/aws/actions_lib.py | 16 ++++++++--------
.../src/general/scripts/aws/dataengine_start.py | 2 +-
.../general/scripts/aws/ssn_terminate_aws_resources.py | 2 +-
.../gcp/common_notebook_configure_dataengine-service.py | 2 +-
.../src/general/scripts/os/dataengine_install_libs.py | 2 +-
.../src/general/scripts/os/dataengine_list_libs.py | 2 +-
.../general/scripts/os/dataengine_reconfigure_spark.py | 2 +-
.../src/general/scripts/os/notebook_git_creds.py | 4 ++--
.../src/general/scripts/os/notebook_inactivity_check.py | 4 ++--
.../src/general/scripts/os/notebook_install_libs.py | 4 ++--
.../src/general/scripts/os/notebook_list_libs.py | 4 ++--
.../src/general/scripts/os/notebook_reconfigure_spark.py | 2 +-
.../aws/computational_resources/modules/ami/ami.tf | 2 +-
.../aws/computational_resources/modules/common/iam.tf | 2 +-
.../computational_resources/modules/common/network.tf | 4 ++--
.../modules/data_engine/instance.tf | 4 ++--
.../aws/computational_resources/modules/emr/instance.tf | 2 +-
.../computational_resources/modules/notebook/instance.tf | 2 +-
.../terraform/aws/endpoint/main/iam.tf | 2 +-
.../terraform/aws/endpoint/main/instance.tf | 2 +-
.../terraform/aws/endpoint/main/network.tf | 14 +++++++-------
.../terraform/aws/project/main/iam.tf | 4 ++--
.../terraform/aws/project/main/instance.tf | 2 +-
.../terraform/aws/project/main/network.tf | 8 ++++----
.../terraform/aws/ssn-k8s/main/auto_scaling_groups.tf | 4 ++--
.../terraform/aws/ssn-k8s/main/lb.tf | 6 +++---
.../terraform/aws/ssn-k8s/main/role_policy.tf | 2 +-
.../terraform/aws/ssn-k8s/main/s3.tf | 2 +-
.../terraform/aws/ssn-k8s/main/security_groups.tf | 2 +-
.../terraform/aws/ssn-k8s/main/vpc.tf | 14 +++++++-------
.../terraform/azure/endpoint/main/instance.tf | 2 +-
.../terraform/azure/endpoint/main/network.tf | 6 +++---
.../com/epam/dlab/automation/cloud/aws/AmazonHelper.java | 2 +-
.../mock_response/aws/dataengine-service_configure.json | 2 +-
.../main/resources/mock_response/aws/edge_create.json | 2 +-
.../main/resources/mock_response/aws/notebook_start.json | 2 +-
.../main/resources/mock_response/aws/notebook_stop.json | 2 +-
.../resources/mock_response/aws/notebook_terminate.json | 2 +-
.../azure/dataengine-service_configure.json | 2 +-
.../main/resources/mock_response/azure/edge_create.json | 2 +-
.../resources/mock_response/azure/notebook_start.json | 2 +-
.../resources/mock_response/azure/notebook_stop.json | 2 +-
.../mock_response/azure/notebook_terminate.json | 2 +-
.../mock_response/gcp/dataengine-service_configure.json | 2 +-
45 files changed, 79 insertions(+), 79 deletions(-)
diff --git
a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index 2c283f5..3864229 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -1322,7 +1322,7 @@ if __name__ == "__main__":
ec2_client = boto3.client('ec2', region_name=args.region)
efs_client = boto3.client('efs', region_name=args.region)
route53_client = boto3.client('route53')
- tag_name = args.service_base_name + '-Tag'
+ tag_name = args.service_base_name + '-tag'
pre_defined_vpc = True
pre_defined_subnet = True
pre_defined_sg = True
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index 4268bf8..1b8d386 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -309,10 +309,10 @@ def create_peer_routes(peering_id, service_base_name):
client = boto3.client('ec2')
try:
route_tables = client.describe_route_tables(
- Filters=[{'Name': 'tag:{}-Tag'.format(service_base_name),
'Values': ['{}'.format(
+ Filters=[{'Name': 'tag:{}-tag'.format(service_base_name),
'Values': ['{}'.format(
service_base_name)]}]).get('RouteTables')
route_tables2 = client.describe_route_tables(Filters=[
- {'Name': 'tag:{}-secondary-Tag'.format(service_base_name),
'Values': ['{}'.format(
+ {'Name': 'tag:{}-secondary-tag'.format(service_base_name),
'Values': ['{}'.format(
service_base_name)]}]).get('RouteTables')
for table in route_tables:
routes = table.get('Routes')
@@ -347,7 +347,7 @@ def create_peering_connection(vpc_id, vpc2_id,
service_base_name):
try:
ec2 = boto3.resource('ec2')
client = boto3.client('ec2')
- tag = {"Key": service_base_name + '-Tag', "Value": service_base_name}
+ tag = {"Key": service_base_name + '-tag', "Value": service_base_name}
tag_name = {"Key": 'Name', "Value":
"{0}-peering-connection".format(service_base_name)}
peering = ec2.create_vpc_peering_connection(PeerVpcId=vpc_id,
VpcId=vpc2_id)
client.accept_vpc_peering_connection(VpcPeeringConnectionId=peering.id)
@@ -513,7 +513,7 @@ def tag_emr_volume(cluster_id, node_name, billing_tag):
cluster = client.list_instances(ClusterId=cluster_id)
instances = cluster['Instances']
for instance in instances:
- instance_tag = {'Key': os.environ['conf_service_base_name'] +
'-Tag',
+ instance_tag = {'Key': os.environ['conf_service_base_name'] +
'-tag',
'Value': node_name}
tag_intance_volume(instance['Ec2InstanceId'], node_name,
instance_tag)
except Exception as err:
@@ -1039,7 +1039,7 @@ def remove_s3(bucket_type='all', scientist=''):
if bucket_name in item.get('Name'):
for i in
client.get_bucket_tagging(Bucket=item.get('Name')).get('TagSet'):
i.get('Key')
- if i.get('Key') == os.environ['conf_service_base_name'] +
'-Tag':
+ if i.get('Key') ==
os.environ['conf_service_base_name'].lower() + '-tag':
bucket_list.append(item.get('Name'))
for s3bucket in bucket_list:
if s3bucket:
@@ -1062,8 +1062,8 @@ def remove_subnets(tag_value):
try:
ec2 = boto3.resource('ec2')
client = boto3.client('ec2')
- tag_name = os.environ['conf_service_base_name'] + '-Tag'
- tag2_name = os.environ['conf_service_base_name'] + '-secondary-Tag'
+ tag_name = os.environ['conf_service_base_name'].lower() + '-tag'
+ tag2_name = os.environ['conf_service_base_name'].lower() +
'-secondary-tag'
subnets = ec2.subnets.filter(
Filters=[{'Name': 'tag:{}'.format(tag_name), 'Values':
[tag_value]}])
subnets2 = ec2.subnets.filter(
@@ -1089,7 +1089,7 @@ def remove_subnets(tag_value):
def remove_peering(tag_value):
try:
client = boto3.client('ec2')
- tag_name = os.environ['conf_service_base_name'] + '-Tag'
+ tag_name = os.environ['conf_service_base_name'].lower() + '-tag'
if os.environ['conf_duo_vpc_enable'] == 'true':
peering_id = client.describe_vpc_peering_connections(Filters=[
{'Name': 'tag-key', 'Values': [tag_name]},
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
index 8040850..aea5583 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
@@ -86,7 +86,7 @@ if __name__ == "__main__":
logging.info('[UPDATE LAST ACTIVITY TIME]')
print('[UPDATE LAST ACTIVITY TIME]')
data_engine['computational_id'] = data_engine['cluster_name'] + '-m'
- data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag'
+ data_engine['tag_name'] = data_engine['service_base_name'] + '-tag'
data_engine['notebook_ip'] = dlab.meta_lib.get_instance_ip_address(
data_engine['tag_name'],
os.environ['notebook_instance_name']).get('Private')
data_engine['computational_ip'] =
dlab.meta_lib.get_instance_ip_address(
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_terminate_aws_resources.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_terminate_aws_resources.py
index a23bda6..615b766 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/ssn_terminate_aws_resources.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/ssn_terminate_aws_resources.py
@@ -38,7 +38,7 @@ parser.add_argument('--de_sg', type=str)
parser.add_argument('--service_base_name', type=str)
parser.add_argument('--de_se_sg', type=str)
args = parser.parse_args()
-tag2 = args.service_base_name + '-secondary-Tag'
+tag2 = args.service_base_name.lower() + '-secondary-tag'
##############
# Run script #
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 a8cd1c8..d58b1c0 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
@@ -57,7 +57,7 @@ if __name__ == "__main__":
notebook_config['project_tag'] = notebook_config['project_name']
notebook_config['endpoint_name'] = (os.environ['endpoint_name']).lower()
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
- notebook_config['tag_name'] = notebook_config['service_base_name'] + '-Tag'
+ notebook_config['tag_name'] = notebook_config['service_base_name'] + '-tag'
notebook_config['bucket_name'] =
'{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
notebook_config['endpoint_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 089e316..f8729f1 100644
---
a/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py
+++
b/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py
@@ -63,7 +63,7 @@ if __name__ == "__main__":
try:
data_engine['os_user'] = os.environ['conf_os_user']
data_engine['service_base_name'] =
os.environ['conf_service_base_name']
- data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag'
+ data_engine['tag_name'] = data_engine['service_base_name'] + '-tag'
data_engine['cluster_name'] = os.environ['computational_id']
data_engine['master_node_name'] = data_engine['cluster_name'] +
'-m'
data_engine['slave_node_name'] = data_engine['cluster_name'] + '-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 0cc5f6e..9f2b18b 100644
--- a/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py
@@ -46,7 +46,7 @@ if __name__ == "__main__":
try:
data_engine['os_user'] = os.environ['conf_os_user']
data_engine['service_base_name'] =
os.environ['conf_service_base_name']
- data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag'
+ data_engine['tag_name'] = data_engine['service_base_name'] + '-tag'
data_engine['cluster_name'] = os.environ['computational_id']
data_engine['master_node_name'] = data_engine['cluster_name'] +
'-m'
data_engine['master_ip'] = get_instance_private_ip_address(
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 006a313..425b12b 100644
---
a/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py
+++
b/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py
@@ -63,7 +63,7 @@ if __name__ == "__main__":
try:
data_engine['os_user'] = os.environ['conf_os_user']
data_engine['service_base_name'] =
os.environ['conf_service_base_name']
- data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag'
+ data_engine['tag_name'] = data_engine['service_base_name'] + '-tag'
data_engine['cluster_name'] = os.environ['computational_id']
data_engine['master_node_name'] = data_engine['cluster_name'] +
'-m'
data_engine['slave_node_name'] = data_engine['cluster_name'] + '-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 23f889f..eaf9ea5 100644
--- a/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py
+++ b/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py
@@ -45,8 +45,8 @@ if __name__ == "__main__":
notebook_config = dict()
notebook_config['notebook_name'] = os.environ['notebook_instance_name']
notebook_config['os_user'] = os.environ['conf_os_user']
- notebook_config['service_base_name'] =
os.environ['conf_service_base_name']
- notebook_config['tag_name'] = notebook_config['service_base_name'] +
'-Tag'
+ notebook_config['service_base_name'] =
os.environ['conf_service_base_name'].lower()
+ notebook_config['tag_name'] = notebook_config['service_base_name'] +
'-tag'
notebook_config['notebook_ip'] = get_instance_private_ip_address(
notebook_config['tag_name'], notebook_config['notebook_name'])
notebook_config['keyfile'] =
'{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
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 59074f8..5e51179 100644
---
a/infrastructure-provisioning/src/general/scripts/os/notebook_inactivity_check.py
+++
b/infrastructure-provisioning/src/general/scripts/os/notebook_inactivity_check.py
@@ -44,8 +44,8 @@ if __name__ == "__main__":
notebook_config['notebook_name'] =
os.environ['notebook_instance_name']
notebook_config['os_user'] = os.environ['conf_os_user']
notebook_config['resource_type'] = os.environ['conf_resource']
- notebook_config['service_base_name'] =
os.environ['conf_service_base_name']
- notebook_config['tag_name'] = notebook_config['service_base_name']
+ '-Tag'
+ notebook_config['service_base_name'] =
os.environ['conf_service_base_name'].lower()
+ notebook_config['tag_name'] = notebook_config['service_base_name']
+ '-tag'
notebook_config['notebook_ip'] = get_instance_private_ip_address(
notebook_config['tag_name'], notebook_config['notebook_name'])
notebook_config['keyfile'] =
'{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
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 17abe27..b56157a 100644
---
a/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py
+++
b/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py
@@ -47,8 +47,8 @@ if __name__ == "__main__":
try:
notebook_config['notebook_name'] =
os.environ['notebook_instance_name']
notebook_config['os_user'] = os.environ['conf_os_user']
- notebook_config['service_base_name'] =
os.environ['conf_service_base_name']
- notebook_config['tag_name'] = notebook_config['service_base_name']
+ '-Tag'
+ notebook_config['service_base_name'] =
os.environ['conf_service_base_name'].lower()
+ notebook_config['tag_name'] = notebook_config['service_base_name']
+ '-tag'
notebook_config['notebook_ip'] = get_instance_private_ip_address(
notebook_config['tag_name'], notebook_config['notebook_name'])
notebook_config['keyfile'] =
'{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
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 839f3f9..820c818 100644
--- a/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py
@@ -46,8 +46,8 @@ if __name__ == "__main__":
try:
notebook_config['notebook_name'] =
os.environ['notebook_instance_name']
notebook_config['os_user'] = os.environ['conf_os_user']
- notebook_config['service_base_name'] =
os.environ['conf_service_base_name']
- notebook_config['tag_name'] = notebook_config['service_base_name']
+ '-Tag'
+ notebook_config['service_base_name'] =
os.environ['conf_service_base_name'].lower()
+ notebook_config['tag_name'] = notebook_config['service_base_name']
+ '-tag'
notebook_config['notebook_ip'] = get_instance_private_ip_address(
notebook_config['tag_name'], notebook_config['notebook_name'])
notebook_config['keyfile'] =
'{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
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 849333c..8bc607c 100644
---
a/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py
+++
b/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py
@@ -48,7 +48,7 @@ if __name__ == "__main__":
notebook_config['notebook_name'] =
os.environ['notebook_instance_name']
notebook_config['os_user'] = os.environ['conf_os_user']
notebook_config['service_base_name'] =
os.environ['conf_service_base_name']
- notebook_config['tag_name'] = notebook_config['service_base_name']
+ '-Tag'
+ notebook_config['tag_name'] = notebook_config['service_base_name']
+ '-tag'
notebook_config['notebook_ip'] = get_instance_private_ip_address(
notebook_config['tag_name'], notebook_config['notebook_name'])
notebook_config['keyfile'] =
'{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
diff --git
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/ami/ami.tf
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/ami/ami.tf
index 1c7117f..aac7afb 100644
---
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/ami/ami.tf
+++
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/ami/ami.tf
@@ -28,7 +28,7 @@ resource "aws_ami_from_instance" "ami" {
source_instance_id = var.source_instance_id
tags {
Name = local.ami_name
- "${var.sbn}-Tag" = local.ami_name
+ "${var.sbn}-tag" = local.ami_name
Product = var.product
Project_name = var.project_name
Project_tag = var.project_tag
diff --git
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/iam.tf
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/iam.tf
index 6624f30..259bb6c 100644
---
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/iam.tf
+++
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/iam.tf
@@ -46,7 +46,7 @@ EOF
tags = {
Name = local.role_name
Environment_tag = var.sbn
- "${var.sbn}-Tag" = local.role_name
+ "${var.sbn}-tag" = local.role_name
Product = var.product
Project_name = var.project_name
Project_tag = var.project_tag
diff --git
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/network.tf
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/network.tf
index 297cf28..2b3c1fb 100644
---
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/network.tf
+++
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/common/network.tf
@@ -30,7 +30,7 @@ resource "aws_subnet" "subnet" {
tags = {
Name = local.subnet_name
- "${var.sbn}-Tag" = local.subnet_name
+ "${var.sbn}-tag" = local.subnet_name
Product = var.product
Project_name = var.project_name
Project_tag = var.project_tag
@@ -68,7 +68,7 @@ resource "aws_security_group" "nb-sg" {
tags = {
Name = local.sg_name
- "${var.sbn}-Tag" = local.sg_name
+ "${var.sbn}-tag" = local.sg_name
Product = var.product
Project_name = var.project_name
Project_tag = var.project_tag
diff --git
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/data_engine/instance.tf
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/data_engine/instance.tf
index 7601e35..12532c1 100644
---
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/data_engine/instance.tf
+++
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/data_engine/instance.tf
@@ -35,7 +35,7 @@ resource "aws_instance" "master" {
Name = "${local.cluster_name}-m"
Type = "master"
dataengine_notebook_name = local.notebook_name
- "${var.sbn}-Tag" = "${local.cluster_name}-m"
+ "${var.sbn}-tag" = "${local.cluster_name}-m"
Product = var.product
Project_name = var.project_name
Project_tag = var.project_tag
@@ -59,7 +59,7 @@ resource "aws_instance" "slave" {
Name = "${local.cluster_name}-s${count.index + 1}"
Type = "slave"
dataengine_notebook_name = local.notebook_name
- "${var.sbn}-Tag" = "${local.cluster_name}-s${count.index + 1}"
+ "${var.sbn}-tag" = "${local.cluster_name}-s${count.index + 1}"
Product = var.product
Project_name = var.project_name
Project_tag = var.project_tag
diff --git
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/emr/instance.tf
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/emr/instance.tf
index 4a03b2d..10f5506 100644
---
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/emr/instance.tf
+++
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/emr/instance.tf
@@ -63,7 +63,7 @@ resource "aws_emr_cluster" "cluster" {
Name = local.cluster_name
Notebook = local.notebook_name
Product = var.product
- "${var.sbn}-Tag" = local.cluster_name
+ "${var.sbn}-tag" = local.cluster_name
Project_name = var.project_name
Project_tag = var.project_tag
User_tag = var.user_tag
diff --git
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/notebook/instance.tf
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/notebook/instance.tf
index 374d6da..64d1d4f 100644
---
a/infrastructure-provisioning/terraform/aws/computational_resources/modules/notebook/instance.tf
+++
b/infrastructure-provisioning/terraform/aws/computational_resources/modules/notebook/instance.tf
@@ -32,7 +32,7 @@ resource "aws_instance" "notebook" {
iam_instance_profile = var.iam_profile_name
tags = {
Name = local.node_name
- "${var.sbn}-Tag" = local.node_name
+ "${var.sbn}-tag" = local.node_name
Project_name = var.project_name
Project_tag = var.project_tag
Endpoint_Tag = var.endpoint_tag
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/iam.tf
b/infrastructure-provisioning/terraform/aws/endpoint/main/iam.tf
index 49d2353..e4c1e69 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/iam.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/iam.tf
@@ -36,7 +36,7 @@ resource "aws_iam_role" "endpoint_role" {
Name = local.endpoint_role_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_role_name}"
- "${var.service_base_name}-Tag" = local.endpoint_role_name
+ "${var.service_base_name}-tag" = local.endpoint_role_name
}
}
diff --git
a/infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
b/infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
index 5c023f5..6bfc09b 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
@@ -39,7 +39,7 @@ resource "aws_instance" "endpoint" {
Name = local.endpoint_instance_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_instance_name}"
- "${var.service_base_name}-Tag" = local.endpoint_instance_name
+ "${var.service_base_name}-tag" = local.endpoint_instance_name
endpoint_id = var.endpoint_id
}
}
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
b/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
index 0abfe50..fad5c57 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
@@ -40,7 +40,7 @@ resource "aws_vpc" "vpc_create" {
Name = local.endpoint_vpc_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_vpc_name}"
- "${var.service_base_name}-Tag" = local.endpoint_vpc_name
+ "${var.service_base_name}-tag" = local.endpoint_vpc_name
}
}
@@ -55,7 +55,7 @@ resource "aws_internet_gateway" "gw" {
Name = local.endpoint_igw_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_igw_name}"
- "${var.service_base_name}-Tag" = local.endpoint_igw_name
+ "${var.service_base_name}-tag" = local.endpoint_igw_name
}
}
@@ -67,7 +67,7 @@ resource "aws_subnet" "endpoint_subnet" {
Name = local.endpoint_subnet_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_subnet_name}"
- "${var.service_base_name}-Tag" = local.endpoint_subnet_name
+ "${var.service_base_name}-tag" = local.endpoint_subnet_name
}
count = var.vpc_id == "" ? 1 : 0
}
@@ -125,7 +125,7 @@ resource "aws_security_group" "endpoint_sec_group" {
Name = local.endpoint_sg_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_sg_name}"
- "${var.service_base_name}-Tag" = local.endpoint_sg_name
+ "${var.service_base_name}-tag" = local.endpoint_sg_name
}
}
@@ -135,7 +135,7 @@ resource "aws_eip" "endpoint_eip" {
Name = local.endpoint_ip_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_ip_name}"
- "${var.service_base_name}-Tag" = local.endpoint_ip_name
+ "${var.service_base_name}-tag" = local.endpoint_ip_name
}
}
@@ -145,8 +145,8 @@ resource "aws_route_table" "projects_route_table" {
Name = local.projects_rt
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.projects_rt}"
- "${var.service_base_name}-Tag" = local.projects_rt
- "${var.service_base_name}-Tag" = var.service_base_name
+ "${var.service_base_name}-tag" = local.projects_rt
+ "${var.service_base_name}-tag" = var.service_base_name
}
}
diff --git a/infrastructure-provisioning/terraform/aws/project/main/iam.tf
b/infrastructure-provisioning/terraform/aws/project/main/iam.tf
index 42fc02b..5aa83e2 100644
--- a/infrastructure-provisioning/terraform/aws/project/main/iam.tf
+++ b/infrastructure-provisioning/terraform/aws/project/main/iam.tf
@@ -50,7 +50,7 @@ resource "aws_iam_role" "edge_role" {
Name = "${local.edge_role_name}"
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.edge_role_name}"
- "${var.service_base_name}-Tag" = local.edge_role_name
+ "${var.service_base_name}-tag" = local.edge_role_name
}
}
@@ -80,7 +80,7 @@ resource "aws_iam_role" "nb_de_role" {
tags = {
Name = local.nb_role_name
Environment_tag = var.service_base_name
- "${var.service_base_name}-Tag" = local.nb_role_name
+ "${var.service_base_name}-tag" = local.nb_role_name
"${local.additional_tag[0]}" = local.additional_tag[1]
Project_name = var.project_name
Project_tag = var.project_tag
diff --git a/infrastructure-provisioning/terraform/aws/project/main/instance.tf
b/infrastructure-provisioning/terraform/aws/project/main/instance.tf
index 7b4cddc..1220743 100644
--- a/infrastructure-provisioning/terraform/aws/project/main/instance.tf
+++ b/infrastructure-provisioning/terraform/aws/project/main/instance.tf
@@ -39,7 +39,7 @@ resource "aws_instance" "edge" {
Name = local.edge_instance_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.edge_instance_name}"
- "${var.service_base_name}-Tag" = local.edge_instance_name
+ "${var.service_base_name}-tag" = local.edge_instance_name
"Endpoint_tag" = var.endpoint_tag
}
}
diff --git a/infrastructure-provisioning/terraform/aws/project/main/network.tf
b/infrastructure-provisioning/terraform/aws/project/main/network.tf
index d1064cd..aac8339 100644
--- a/infrastructure-provisioning/terraform/aws/project/main/network.tf
+++ b/infrastructure-provisioning/terraform/aws/project/main/network.tf
@@ -38,7 +38,7 @@ resource "aws_eip" "edge_ip" {
Name = local.edge_ip_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.edge_ip_name}"
- "${var.service_base_name}-Tag" = local.edge_ip_name
+ "${var.service_base_name}-tag" = local.edge_ip_name
}
}
@@ -211,7 +211,7 @@ resource "aws_security_group" "edge_sg" {
Name = local.edge_sg_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.edge_sg_name}"
- "${var.service_base_name}-Tag" = local.edge_sg_name
+ "${var.service_base_name}-tag" = local.edge_sg_name
}
}
@@ -225,7 +225,7 @@ resource "aws_subnet" "private_subnet" {
tags = {
Name = local.nb_subnet_name
- "${local.sbn}-Tag" = local.nb_subnet_name
+ "${local.sbn}-tag" = local.nb_subnet_name
"${local.additional_tag[0]}" = local.additional_tag[1]
Project_name = var.project_name
Project_tag = var.project_tag
@@ -263,7 +263,7 @@ resource "aws_security_group" "nb-sg" {
tags = {
Name = local.sg_name
- "${local.sbn}-Tag" = local.sg_name
+ "${local.sbn}-tag" = local.sg_name
"${local.additional_tag[0]}" = local.additional_tag[1]
Project_name = var.project_name
Project_tag = var.project_tag
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
index 69cfbcd..41dfb20 100644
---
a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
+++
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
@@ -122,7 +122,7 @@ resource "aws_autoscaling_group"
"ssn_k8s_autoscaling_group_masters" {
propagate_at_launch = true
},
{
- key = "${var.service_base_name}-Tag"
+ key = "${var.service_base_name}-tag"
value = local.ssn_k8s_ag_masters_name
propagate_at_launch = true
},
@@ -162,7 +162,7 @@ resource "aws_autoscaling_group"
"ssn_k8s_autoscaling_group_workers" {
propagate_at_launch = true
},
{
- key = "${var.service_base_name}-Tag"
+ key = "${var.service_base_name}-tag"
value = local.ssn_k8s_ag_workers_name
propagate_at_launch = true
},
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
index 4000cdd..bd0baf8 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/lb.tf
@@ -36,7 +36,7 @@ resource "aws_lb" "ssn_k8s_nlb" {
Name = local.ssn_nlb_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_nlb_name}"
- "${var.service_base_name}-Tag" = local.ssn_nlb_name
+ "${var.service_base_name}-tag" = local.ssn_nlb_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -50,7 +50,7 @@ resource "aws_lb_target_group" "ssn_k8s_nlb_api_target_group"
{
Name =
local.ssn_k8s_nlb_api_tg_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_k8s_nlb_api_tg_name}"
- "${var.service_base_name}-Tag" =
local.ssn_k8s_nlb_api_tg_name
+ "${var.service_base_name}-tag" =
local.ssn_k8s_nlb_api_tg_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -64,7 +64,7 @@ resource "aws_lb_target_group"
"ssn_k8s_nlb_step_ca_target_group" {
Name =
local.ssn_k8s_nlb_step_ca_tg_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_k8s_nlb_step_ca_tg_name}"
- "${var.service_base_name}-Tag" =
local.ssn_k8s_nlb_step_ca_tg_name
+ "${var.service_base_name}-tag" =
local.ssn_k8s_nlb_step_ca_tg_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf
index 79c5969..e01b1d6 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/role_policy.tf
@@ -41,7 +41,7 @@ resource "aws_iam_role" "ssn_k8s_role" {
Name = local.ssn_role_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_role_name}"
- "${var.service_base_name}-Tag" = local.ssn_role_name
+ "${var.service_base_name}-tag" = local.ssn_role_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
index 622956b..f91e6ca 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/s3.tf
@@ -30,7 +30,7 @@ resource "aws_s3_bucket" "ssn_k8s_bucket" {
Name = local.ssn_s3_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_s3_name}"
- "${var.service_base_name}-Tag" = local.ssn_s3_name
+ "${var.service_base_name}-tag" = local.ssn_s3_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
force_destroy = true
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/security_groups.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/security_groups.tf
index 54c1648..b9f7fa8 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/security_groups.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/security_groups.tf
@@ -59,7 +59,7 @@ resource "aws_security_group" "ssn_k8s_sg" {
Name = local.ssn_sg_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_sg_name}"
- "${var.service_base_name}-Tag" = local.ssn_sg_name
+ "${var.service_base_name}-tag" = local.ssn_sg_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
index a21ee81..699dfcd 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
@@ -41,7 +41,7 @@ resource "aws_vpc" "ssn_k8s_vpc" {
Name = local.ssn_vpc_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_vpc_name}"
- "${var.service_base_name}-Tag" = local.ssn_vpc_name
+ "${var.service_base_name}-tag" = local.ssn_vpc_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -54,7 +54,7 @@ resource "aws_internet_gateway" "ssn_k8s_igw" {
Name = local.ssn_igw_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_igw_name}"
- "${var.service_base_name}-Tag" = local.ssn_igw_name
+ "${var.service_base_name}-tag" = local.ssn_igw_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -81,7 +81,7 @@ resource "aws_subnet" "ssn_k8s_subnet_a" {
Name = local.ssn_subnet_a_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_subnet_a_name}"
- "${var.service_base_name}-Tag" = local.ssn_subnet_a_name
+ "${var.service_base_name}-tag" = local.ssn_subnet_a_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -97,7 +97,7 @@ resource "aws_subnet" "ssn_k8s_subnet_b" {
Name = local.ssn_subnet_b_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_subnet_b_name}"
- "${var.service_base_name}-Tag" = local.ssn_subnet_b_name
+ "${var.service_base_name}-tag" = local.ssn_subnet_b_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -113,7 +113,7 @@ resource "aws_subnet" "ssn_k8s_subnet_c" {
Name = local.ssn_subnet_c_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.ssn_subnet_c_name}"
- "${var.service_base_name}-Tag" = local.ssn_subnet_c_name
+ "${var.service_base_name}-tag" = local.ssn_subnet_c_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
@@ -135,7 +135,7 @@ resource "aws_route_table" "ssn-k8s-users-route-table" {
vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
tags = {
Name = local.endpoint_rt_name
- "${var.service_base_name}-Tag" = var.service_base_name
+ "${var.service_base_name}-tag" = var.service_base_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_rt_name}"
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
@@ -149,7 +149,7 @@ resource "aws_vpc_endpoint" "ssn-k8s-users-s3-endpoint" {
Name = local.endpoint_s3_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_s3_name}"
- "${var.service_base_name}-Tag" = local.endpoint_s3_name
+ "${var.service_base_name}-tag" = local.endpoint_s3_name
"kubernetes.io/cluster/${local.cluster_name}" = "owned"
}
}
diff --git
a/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
b/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
index 7729479..82c1497 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/instance.tf
@@ -65,6 +65,6 @@ resource "azurerm_virtual_machine" "endpoint_instance" {
Name = local.endpoint_instance_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_instance_name}"
- "${var.service_base_name}-Tag" = local.endpoint_instance_name
+ "${var.service_base_name}-tag" = local.endpoint_instance_name
}
}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index 880d150..e637bc7 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -38,7 +38,7 @@ resource "azurerm_virtual_network" "endpoint-network" {
Name = local.endpoint_vpc_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_vpc_name}"
- "${var.service_base_name}-Tag" = local.endpoint_vpc_name
+ "${var.service_base_name}-tag" = local.endpoint_vpc_name
}
}
@@ -71,7 +71,7 @@ resource "azurerm_public_ip" "endpoint-static-ip" {
Name = local.endpoint_ip_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_ip_name}"
- "${var.service_base_name}-Tag" = local.endpoint_ip_name
+ "${var.service_base_name}-tag" = local.endpoint_ip_name
}
}
@@ -93,6 +93,6 @@ resource "azurerm_network_interface" "endpoint-nif" {
Name = local.endpoint_nif_name
"${local.additional_tag[0]}" = local.additional_tag[1]
"${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_nif_name}"
- "${var.service_base_name}-Tag" = local.endpoint_nif_name
+ "${var.service_base_name}-tag" = local.endpoint_nif_name
}
}
diff --git
a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonHelper.java
b/integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonHelper.java
index 3b0ef82..117f3ee 100644
---
a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonHelper.java
+++
b/integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonHelper.java
@@ -64,7 +64,7 @@ public class AmazonHelper {
List<String> valuesT1 = new ArrayList<>();
valuesT1.add(instanceName + "*");
- Filter filter = new Filter("tag:" +
NamingHelper.getServiceBaseName() + "-Tag", valuesT1);
+ Filter filter = new Filter("tag:" +
NamingHelper.getServiceBaseName() + "-tag", valuesT1);
DescribeInstancesRequest describeInstanceRequest = new
DescribeInstancesRequest().withFilters(filter);
DescribeInstancesResult describeInstanceResult =
ec2.describeInstances(describeInstanceRequest);
diff --git
a/services/provisioning-service/src/main/resources/mock_response/aws/dataengine-service_configure.json
b/services/provisioning-service/src/main/resources/mock_response/aws/dataengine-service_configure.json
index e6661b8..b8be3bf 100644
---
a/services/provisioning-service/src/main/resources/mock_response/aws/dataengine-service_configure.json
+++
b/services/provisioning-service/src/main/resources/mock_response/aws/dataengine-service_configure.json
@@ -3,7 +3,7 @@
"response": {
"result": {
"Action": "Configure notebook server",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
"log": "/var/log/dlab/emr/emr_${EDGE_USER_NAME}_${REQUEST_ID}.log"
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 fe2bf0a..81afe8a 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
@@ -6,7 +6,7 @@
"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",
+ "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}",
diff --git
a/services/provisioning-service/src/main/resources/mock_response/aws/notebook_start.json
b/services/provisioning-service/src/main/resources/mock_response/aws/notebook_start.json
index 1933ea3..525bd9a 100644
---
a/services/provisioning-service/src/main/resources/mock_response/aws/notebook_start.json
+++
b/services/provisioning-service/src/main/resources/mock_response/aws/notebook_start.json
@@ -4,7 +4,7 @@
"result": {
"Action": "Start up notebook server",
"ip": "172.31.48.131",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"hostname": "ip-172-31-48-131.us-west-2.compute.internal",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
diff --git
a/services/provisioning-service/src/main/resources/mock_response/aws/notebook_stop.json
b/services/provisioning-service/src/main/resources/mock_response/aws/notebook_stop.json
index 4e1b9f0..e0ee8b1 100644
---
a/services/provisioning-service/src/main/resources/mock_response/aws/notebook_stop.json
+++
b/services/provisioning-service/src/main/resources/mock_response/aws/notebook_stop.json
@@ -4,7 +4,7 @@
"result": {
"Action": "Stop notebook server",
"user_own_bucket_name": "${CONF_SERVICE_BASE_NAME}-ssn-bucket",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
"log":
"/var/log/dlab/notebook/notebook_${EDGE_USER_NAME}_${REQUEST_ID}.log"
diff --git
a/services/provisioning-service/src/main/resources/mock_response/aws/notebook_terminate.json
b/services/provisioning-service/src/main/resources/mock_response/aws/notebook_terminate.json
index 74c82ad7..a9e2a3a 100644
---
a/services/provisioning-service/src/main/resources/mock_response/aws/notebook_terminate.json
+++
b/services/provisioning-service/src/main/resources/mock_response/aws/notebook_terminate.json
@@ -4,7 +4,7 @@
"result": {
"Action": "Terminate notebook server",
"user_own_bucket_name": "${CONF_SERVICE_BASE_NAME}-ssn-bucket",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
"log":
"/var/log/dlab/notebook/notebook_${EDGE_USER_NAME}_${REQUEST_ID}.log"
diff --git
a/services/provisioning-service/src/main/resources/mock_response/azure/dataengine-service_configure.json
b/services/provisioning-service/src/main/resources/mock_response/azure/dataengine-service_configure.json
index e6661b8..b8be3bf 100644
---
a/services/provisioning-service/src/main/resources/mock_response/azure/dataengine-service_configure.json
+++
b/services/provisioning-service/src/main/resources/mock_response/azure/dataengine-service_configure.json
@@ -3,7 +3,7 @@
"response": {
"result": {
"Action": "Configure notebook server",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
"log": "/var/log/dlab/emr/emr_${EDGE_USER_NAME}_${REQUEST_ID}.log"
diff --git
a/services/provisioning-service/src/main/resources/mock_response/azure/edge_create.json
b/services/provisioning-service/src/main/resources/mock_response/azure/edge_create.json
index cda1c9e..b2a9931 100644
---
a/services/provisioning-service/src/main/resources/mock_response/azure/edge_create.json
+++
b/services/provisioning-service/src/main/resources/mock_response/azure/edge_create.json
@@ -6,7 +6,7 @@
"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",
+ "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}",
diff --git
a/services/provisioning-service/src/main/resources/mock_response/azure/notebook_start.json
b/services/provisioning-service/src/main/resources/mock_response/azure/notebook_start.json
index 1933ea3..525bd9a 100644
---
a/services/provisioning-service/src/main/resources/mock_response/azure/notebook_start.json
+++
b/services/provisioning-service/src/main/resources/mock_response/azure/notebook_start.json
@@ -4,7 +4,7 @@
"result": {
"Action": "Start up notebook server",
"ip": "172.31.48.131",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"hostname": "ip-172-31-48-131.us-west-2.compute.internal",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
diff --git
a/services/provisioning-service/src/main/resources/mock_response/azure/notebook_stop.json
b/services/provisioning-service/src/main/resources/mock_response/azure/notebook_stop.json
index 4e1b9f0..e0ee8b1 100644
---
a/services/provisioning-service/src/main/resources/mock_response/azure/notebook_stop.json
+++
b/services/provisioning-service/src/main/resources/mock_response/azure/notebook_stop.json
@@ -4,7 +4,7 @@
"result": {
"Action": "Stop notebook server",
"user_own_bucket_name": "${CONF_SERVICE_BASE_NAME}-ssn-bucket",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
"log":
"/var/log/dlab/notebook/notebook_${EDGE_USER_NAME}_${REQUEST_ID}.log"
diff --git
a/services/provisioning-service/src/main/resources/mock_response/azure/notebook_terminate.json
b/services/provisioning-service/src/main/resources/mock_response/azure/notebook_terminate.json
index 74c82ad7..a9e2a3a 100644
---
a/services/provisioning-service/src/main/resources/mock_response/azure/notebook_terminate.json
+++
b/services/provisioning-service/src/main/resources/mock_response/azure/notebook_terminate.json
@@ -4,7 +4,7 @@
"result": {
"Action": "Terminate notebook server",
"user_own_bucket_name": "${CONF_SERVICE_BASE_NAME}-ssn-bucket",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
"log":
"/var/log/dlab/notebook/notebook_${EDGE_USER_NAME}_${REQUEST_ID}.log"
diff --git
a/services/provisioning-service/src/main/resources/mock_response/gcp/dataengine-service_configure.json
b/services/provisioning-service/src/main/resources/mock_response/gcp/dataengine-service_configure.json
index e6661b8..b8be3bf 100644
---
a/services/provisioning-service/src/main/resources/mock_response/gcp/dataengine-service_configure.json
+++
b/services/provisioning-service/src/main/resources/mock_response/gcp/dataengine-service_configure.json
@@ -3,7 +3,7 @@
"response": {
"result": {
"Action": "Configure notebook server",
- "Tag_name": "${CONF_SERVICE_BASE_NAME}-Tag",
+ "Tag_name": "${CONF_SERVICE_BASE_NAME}-tag",
"notebook_name": "${NOTEBOOK_INSTANCE_NAME}"
},
"log": "/var/log/dlab/emr/emr_${EDGE_USER_NAME}_${REQUEST_ID}.log"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]