You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by ad...@apache.org on 2019/10/11 13:49:59 UTC
[incubator-dlab] branch DLAB-1145 updated (83dd98a -> 6c2f41f)
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a change to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 83dd98a fixed typo
new 0f480e8 Added compute.networks.get permission into GCP Enpoint.
new f72ef53 Added roles/compute.networkUser to GCP Endpoint roles.
new cda71d8 Name of Endpoint SA is set to max 28 symbols.
new 5e878c0 fixed typo
new 18d16b9 Set git downloading certs from project bucket.
new 23f77dd Added Endpoint name in shared and project buckets for aws.
new 8caa3f6 Added Endpoint name in shared and project buckets for azure.
new 6c2f41f fix typo
The 8 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:
.../src/general/lib/aws/actions_lib.py | 7 ++++---
.../src/general/lib/azure/actions_lib.py | 5 +++--
.../src/general/scripts/aws/common_create_policy.py | 3 ++-
.../general/scripts/aws/common_download_git_certfile.py | 5 ++++-
.../aws/common_notebook_configure_dataengine-service.py | 6 +++++-
.../src/general/scripts/aws/common_stop_notebook.py | 6 +++++-
.../src/general/scripts/aws/common_terminate_notebook.py | 6 +++++-
.../general/scripts/aws/dataengine-service_configure.py | 8 ++++----
.../src/general/scripts/aws/dataengine-service_prepare.py | 4 +++-
.../general/scripts/aws/dataengine-service_terminate.py | 5 ++++-
.../src/general/scripts/aws/edge_configure.py | 14 +++++++++-----
.../src/general/scripts/aws/project_prepare.py | 4 ++--
.../src/general/scripts/aws/ssn_configure.py | 3 ++-
.../src/general/scripts/aws/ssn_prepare.py | 3 ++-
.../general/scripts/azure/common_download_git_certfile.py | 3 ++-
.../src/general/scripts/azure/edge_configure.py | 10 ++++++----
.../src/general/scripts/azure/edge_prepare.py | 6 ++++--
.../src/general/scripts/azure/project_prepare.py | 6 ++++--
.../src/general/scripts/azure/ssn_configure.py | 4 +++-
.../src/general/scripts/azure/ssn_prepare.py | 4 +++-
.../general/scripts/gcp/common_download_git_certfile.py | 3 ++-
.../src/general/scripts/gcp/edge_configure.py | 3 +--
.../src/general/scripts/gcp/project_prepare.py | 3 +--
.../src/ssn/scripts/gitlab_deploy.py | 3 ++-
.../terraform/gcp/endpoint/main/iam.tf | 2 +-
.../terraform/gcp/endpoint/main/variables.tf | 1 +
26 files changed, 84 insertions(+), 43 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 05/08: Set git downloading certs from project
bucket.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 18d16b9fc6d59008d90a2fe89a60dd4d07e0b299
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Thu Oct 10 17:01:20 2019 +0300
Set git downloading certs from project bucket.
---
.../src/general/scripts/gcp/common_download_git_certfile.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_download_git_certfile.py b/infrastructure-provisioning/src/general/scripts/gcp/common_download_git_certfile.py
index 40d6e5d..6ce9448 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_download_git_certfile.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_download_git_certfile.py
@@ -41,7 +41,8 @@ if __name__ == "__main__":
env.key_filename = "{}".format(args.keyfile)
env.host_string = env.user + "@" + env.hosts
- bucket_name = ('{}-ssn-bucket'.format(os.environ['conf_service_base_name'])).lower().replace('_', '-')
+ bucket_name = ('{0}-{1}-{2}-bucket'.format(os.environ['conf_service_base_name'], os.environ['project_name'],
+ os.environ['endpoint_name'])).lower().replace('_', '-')
gitlab_certfile = os.environ['conf_gitlab_certfile']
if GCPActions().get_gitlab_cert(bucket_name, gitlab_certfile):
put(gitlab_certfile, gitlab_certfile)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 06/08: Added Endpoint name in shared and project
buckets for aws.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 23f77dd6ede4bb4c72f7f45324605f977b6f8e44
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Fri Oct 11 15:56:27 2019 +0300
Added Endpoint name in shared and project buckets for aws.
---
.../src/general/lib/aws/actions_lib.py | 7 ++++---
.../src/general/scripts/aws/common_create_policy.py | 3 ++-
.../general/scripts/aws/common_download_git_certfile.py | 5 ++++-
.../aws/common_notebook_configure_dataengine-service.py | 6 +++++-
.../src/general/scripts/aws/common_stop_notebook.py | 6 +++++-
.../src/general/scripts/aws/common_terminate_notebook.py | 6 +++++-
.../general/scripts/aws/dataengine-service_configure.py | 8 ++++----
.../src/general/scripts/aws/dataengine-service_prepare.py | 4 +++-
.../general/scripts/aws/dataengine-service_terminate.py | 5 ++++-
.../src/general/scripts/aws/edge_configure.py | 14 +++++++++-----
.../src/general/scripts/aws/project_prepare.py | 4 ++--
.../src/general/scripts/aws/ssn_configure.py | 3 ++-
.../src/general/scripts/aws/ssn_prepare.py | 3 ++-
.../src/ssn/scripts/gitlab_deploy.py | 3 ++-
14 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index 9fb4e3c..50eabf5 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -1026,10 +1026,11 @@ def remove_s3(bucket_type='all', scientist=''):
bucket_list = []
if bucket_type == 'ssn':
bucket_name = (os.environ['conf_service_base_name'] + '-ssn-bucket').lower().replace('_', '-')
- bucket_list.append((os.environ['conf_service_base_name'] + '-shared-bucket').lower().replace('_', '-'))
+ bucket_list.append(('{0}-{1}-shared-bucket'.format(os.environ['conf_service_base_name'],
+ os.environ['default_endpoint_name'])).lower().replace('_', '-'))
elif bucket_type == 'edge':
- bucket_name = (os.environ['conf_service_base_name'] + '-' + "{}".format(scientist) +
- '-bucket').lower().replace('_', '-')
+ bucket_name = (os.environ['conf_service_base_name'] + '-' + "{}".format(scientist) + '-' +
+ os.environ['endpoint_name'] + '-bucket').lower().replace('_', '-')
else:
bucket_name = (os.environ['conf_service_base_name']).lower().replace('_', '-')
for item in client.list_buckets().get('Buckets'):
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_create_policy.py b/infrastructure-provisioning/src/general/scripts/aws/common_create_policy.py
index 02b2fd7..3cad721 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_create_policy.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_create_policy.py
@@ -46,7 +46,8 @@ if __name__ == "__main__":
handler = open('/root/templates/edge_s3_policy.json', 'r')
policy = handler.read()
policy = policy.replace('BUCKET_NAME', args.bucket_name)
- policy = policy.replace('SSN_BUCK', args.ssn_bucket_name)
+ # Removed for multiple Endpoints per project
+ # policy = policy.replace('SSN_BUCK', args.ssn_bucket_name)
policy = policy.replace('SHARED_BUCK', args.shared_bucket_name)
if args.region == 'cn-north-1':
policy = policy.replace('aws', 'aws-cn')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py b/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
index 3aa9ee8..bd7d266 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
@@ -44,7 +44,10 @@ if __name__ == "__main__":
service_base_name = os.environ['conf_service_base_name'] = replace_multi_symbols(
os.environ['conf_service_base_name'].lower()[:12], '-', True)
- bucket_name = ('{}-ssn-bucket'.format(service_base_name)).lower().replace('_', '-')
+ project_name = os.environ['project_name']
+ endpoint_name = os.environ['endpoint_name']
+ bucket_name = ('{0}-{1}-{2}-bucket'.format(service_base_name,
+ project_name, endpoint_name)).lower().replace('_', '-')
gitlab_certfile = os.environ['conf_gitlab_certfile']
if dlab.actions_lib.get_gitlab_cert(bucket_name, gitlab_certfile):
put(gitlab_certfile, gitlab_certfile)
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 abde15f..6fe139b 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
@@ -47,7 +47,11 @@ if __name__ == "__main__":
os.environ['conf_service_base_name'].lower()[:12], '-', True)
notebook_config['notebook_name'] = os.environ['notebook_instance_name']
notebook_config['tag_name'] = notebook_config['service_base_name'] + '-Tag'
- notebook_config['bucket_name'] = (notebook_config['service_base_name'] + '-ssn-bucket').lower().replace('_', '-')
+ notebook_config['project_name'] = os.environ['project_name']
+ notebook_config['endpoint_name'] = os.environ['endpoint_name']
+ notebook_config['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
+ notebook_config['project_name'],
+ notebook_config['endpoint_name'])).lower().replace('_', '-')
notebook_config['cluster_name'] = get_not_configured_emr(notebook_config['tag_name'],
notebook_config['notebook_name'], True)
notebook_config['notebook_ip'] = get_instance_ip_address(notebook_config['tag_name'],
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 b11299b..dc61a7a 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
@@ -101,7 +101,11 @@ if __name__ == "__main__":
notebook_config['service_base_name'] = os.environ['conf_service_base_name'] = replace_multi_symbols(
os.environ['conf_service_base_name'].lower()[:12], '-', True)
notebook_config['notebook_name'] = os.environ['notebook_instance_name']
- notebook_config['bucket_name'] = (notebook_config['service_base_name'] + '-ssn-bucket').lower().replace('_', '-')
+ notebook_config['project_name'] = os.environ['project_name']
+ notebook_config['endpoint_name'] = os.environ['endpoint_name']
+ notebook_config['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
+ notebook_config['project_name'],
+ notebook_config['endpoint_name'])).lower().replace('_', '-')
notebook_config['tag_name'] = notebook_config['service_base_name'] + '-Tag'
notebook_config['key_path'] = os.environ['conf_key_dir'] + '/' + os.environ['conf_key_name'] + '.pem'
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 61f930e..caeaf70 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
@@ -79,7 +79,11 @@ if __name__ == "__main__":
notebook_config['service_base_name'] = notebook_config['service_base_name'] = os.environ['conf_service_base_name'] = replace_multi_symbols(
os.environ['conf_service_base_name'].lower()[:12], '-', True)
notebook_config['notebook_name'] = os.environ['notebook_instance_name']
- notebook_config['bucket_name'] = (notebook_config['service_base_name'] + '-ssn-bucket').lower().replace('_', '-')
+ notebook_config['project_name'] = os.environ['project_name']
+ notebook_config['endpoint_name'] = os.environ['endpoint_name']
+ notebook_config['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
+ notebook_config['project_name'],
+ notebook_config['endpoint_name'])).lower().replace('_', '-')
notebook_config['tag_name'] = notebook_config['service_base_name'] + '-Tag'
try:
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 7b2011c..cb79b1a 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -181,6 +181,8 @@ if __name__ == "__main__":
emr_conf['apps'] = 'Hadoop Hive Hue Spark'
emr_conf['service_base_name'] = os.environ['conf_service_base_name'] = replace_multi_symbols(
os.environ['conf_service_base_name'].lower()[:12], '-', True)
+ emr_conf['project_name'] = os.environ['project_name']
+ emr_conf['endpoint_name'] = os.environ['endpoint_name']
emr_conf['tag_name'] = emr_conf['service_base_name'] + '-Tag'
emr_conf['key_name'] = os.environ['conf_key_name']
emr_conf['region'] = os.environ['aws_region']
@@ -202,8 +204,8 @@ if __name__ == "__main__":
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('_', '-')
-
+ emr_conf['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], emr_conf['project_name'],
+ emr_conf['endpoint_name'])).lower().replace('_', '-')
tag = {"Key": "{}-Tag".format(emr_conf['service_base_name']), "Value": "{}-{}-subnet".format(
emr_conf['service_base_name'], os.environ['project_name'])}
emr_conf['subnet_cidr'] = get_subnet_by_tag(tag)
@@ -216,8 +218,6 @@ if __name__ == "__main__":
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['project_name'] = os.environ['project_name']
- emr_conf['endpoint_name'] = os.environ['endpoint_name']
emr_conf['edge_instance_name'] = '{0}-{1}-{2}-edge'.format(emr_conf['service_base_name'],
emr_conf['project_name'], emr_conf['endpoint_name'])
emr_conf['edge_instance_hostname'] = get_instance_private_ip_address(emr_conf['tag_name'],
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 8925630..8958fee 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
@@ -86,6 +86,7 @@ if __name__ == "__main__":
emr_conf['tag_name'] = '{0}-Tag'.format(emr_conf['service_base_name'])
emr_conf['key_name'] = os.environ['conf_key_name']
emr_conf['endpoint_tag'] = os.environ['endpoint_name']
+ emr_conf['endpoint_name'] = os.environ['endpoint_name']
emr_conf['project_tag'] = os.environ['project_name']
emr_conf['region'] = os.environ['aws_region']
emr_conf['release_label'] = os.environ['emr_version']
@@ -115,7 +116,8 @@ if __name__ == "__main__":
emr_conf['exploratory_name'],
emr_conf['computational_name'],
args.uuid)
- emr_conf['bucket_name'] = '{0}-ssn-bucket'.format(emr_conf['service_base_name']).lower().replace('_', '-')
+ emr_conf['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], emr_conf['project_name'],
+ emr_conf['endpoint_name'])).lower().replace('_', '-')
emr_conf['configurations'] = '[]'
if 'emr_configurations' in os.environ:
emr_conf['configurations'] = os.environ['emr_configurations']
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 25929df..05f2e1f 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py
@@ -73,7 +73,10 @@ if __name__ == "__main__":
os.environ['conf_service_base_name'].lower()[:12], '-', True)
emr_conf['emr_name'] = os.environ['emr_cluster_name']
emr_conf['notebook_name'] = os.environ['notebook_instance_name']
- emr_conf['bucket_name'] = (emr_conf['service_base_name'] + '-ssn-bucket').lower().replace('_', '-')
+ emr_conf['project_name'] = os.environ['project_name']
+ emr_conf['endpoint_name'] = os.environ['endpoint_name']
+ emr_conf['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], emr_conf['project_name'],
+ emr_conf['endpoint_name'])).lower().replace('_', '-')
emr_conf['key_path'] = os.environ['conf_key_dir'] + '/' + os.environ['conf_key_name'] + '.pem'
emr_conf['tag_name'] = emr_conf['service_base_name'] + '-Tag'
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index c9705b8..efa85f5 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -41,12 +41,16 @@ if __name__ == "__main__":
os.environ['conf_service_base_name'].lower()[:12], '-', True)
edge_conf['key_name'] = os.environ['conf_key_name']
edge_conf['user_key'] = os.environ['key']
- edge_conf['instance_name'] = '{}-{}-{}-edge'.format(edge_conf['service_base_name'], os.environ['project_name'],
- os.environ['endpoint_name'])
+ edge_conf['project_name'] = os.environ['project_name']
+ edge_conf['endpoint_name'] = os.environ['endpoint_name']
+ edge_conf['instance_name'] = '{}-{}-{}-edge'.format(edge_conf['service_base_name'], edge_conf['project_name'],
+ edge_conf['endpoint_name'])
edge_conf['tag_name'] = edge_conf['service_base_name'] + '-Tag'
- edge_conf['bucket_name'] = '{}-{}-bucket'.format(edge_conf['service_base_name'],
- os.environ['project_name']).lower().replace('_', '-')
- edge_conf['shared_bucket_name'] = (edge_conf['service_base_name'] + '-shared-bucket').lower().replace('_', '-')
+ edge_conf['bucket_name'] = '{0}-{1}-{2}-bucket'.format(edge_conf['service_base_name'],
+ edge_conf['project_name'],
+ edge_conf['endpoint_name']).lower().replace('_', '-')
+ edge_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(edge_conf['service_base_name'],
+ edge_conf['default_endpoint_name']).lower().replace('_', '-')
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['project_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index f1ae5d2..4797796 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -63,8 +63,8 @@ if __name__ == "__main__":
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['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(
+ project_conf['service_base_name'], project_conf['endpoint_tag']).lower().replace('_', '-')
project_conf['edge_role_name'] = '{}-{}-edge-Role'.format(
project_conf['service_base_name'].lower().replace('-', '_'), os.environ['project_name'])
project_conf['edge_role_profile_name'] = '{}-{}-edge-Profile'.format(
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 07fc829..ab6191d 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -45,7 +45,8 @@ if __name__ == "__main__":
role_profile_name = service_base_name.lower().replace('-', '_') + '-ssn-Profile'
policy_name = service_base_name.lower().replace('-', '_') + '-ssn-Policy'
ssn_bucket_name_tag = service_base_name + '-ssn-bucket'
- shared_bucket_name_tag = service_base_name + '-shared-bucket'
+ default_endpoint_name = os.environ['default_endpoint_name']
+ shared_bucket_name_tag = '{0}-{1}-shared-bucket'.format(service_base_name, default_endpoint_name)
ssn_bucket_name = ssn_bucket_name_tag.lower().replace('_', '-')
shared_bucket_name = shared_bucket_name_tag.lower().replace('_', '-')
tag_name = service_base_name + '-Tag'
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
index e9bac27..9acf264 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
@@ -62,7 +62,8 @@ if __name__ == "__main__":
role_profile_name = service_base_name.lower().replace('-', '_') + '-ssn-Profile'
policy_name = service_base_name.lower().replace('-', '_') + '-ssn-Policy'
ssn_bucket_name_tag = service_base_name + '-ssn-bucket'
- shared_bucket_name_tag = service_base_name + '-shared-bucket'
+ default_endpoint_name = os.environ['default_endpoint_name']
+ shared_bucket_name_tag = '{0}-{1}-shared-bucket'.format(service_base_name, default_endpoint_name)
ssn_bucket_name = ssn_bucket_name_tag.lower().replace('_', '-')
shared_bucket_name = shared_bucket_name_tag.lower().replace('_', '-')
tag_name = service_base_name + '-Tag'
diff --git a/infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py b/infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py
index 2f65895..d6b8dfc 100644
--- a/infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py
+++ b/infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py
@@ -214,7 +214,8 @@ if __name__ == "__main__":
terminate_gitlab()
sys.exit(1)
- bucket_name = ('{}-ssn-bucket'.format(os.environ['conf_service_base_name'])).lower().replace('_', '-')
+ bucket_name = ('{0}-{1}-{2}-bucket'.format(os.environ['service_base_name'], os.environ['project_name'],
+ os.environ['endpoint_name'])).lower().replace('_', '-')
for filename in os.listdir(head):
if filename.endswith('.crt'):
put_to_bucket(bucket_name, os.path.join(head, filename), filename)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/08: fixed typo
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5e878c08977605e3f213825d102f561c1bf8ae2c
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Thu Oct 10 14:31:14 2019 +0300
fixed typo
---
infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py | 3 +--
infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index f6a3a9a..2271d97 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -71,9 +71,8 @@ if __name__ == "__main__":
edge_conf['bucket_name'] = '{0}-{1}-{2}-bucket'.format(edge_conf['service_base_name'],
edge_conf['project_name'],
edge_conf['endpoint_name'])
- edge_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
edge_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(edge_conf['service_base_name'],
- edge_conf['default_endpoint_name'])
+ edge_conf['endpoint_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['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 733c683..e8ee8c0 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -77,9 +77,8 @@ if __name__ == "__main__":
project_conf['bucket_name'] = '{0}-{1}-{2}-bucket'.format(project_conf['service_base_name'],
project_conf['project_name'],
project_conf['endpoint_name'])
- project_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
project_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(project_conf['service_base_name'],
- project_conf['default_endpoint_name'])
+ project_conf['endpoint_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'])]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 07/08: Added Endpoint name in shared and project
buckets for azure.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 8caa3f6bf256cc9bbdd0a6630e6c8e7ba6426d8f
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Fri Oct 11 16:46:20 2019 +0300
Added Endpoint name in shared and project buckets for azure.
---
.../src/general/lib/azure/actions_lib.py | 5 +++--
.../src/general/scripts/azure/common_download_git_certfile.py | 3 ++-
.../src/general/scripts/azure/edge_configure.py | 10 ++++++----
.../src/general/scripts/azure/edge_prepare.py | 6 ++++--
.../src/general/scripts/azure/project_prepare.py | 6 ++++--
.../src/general/scripts/azure/ssn_configure.py | 4 +++-
.../src/general/scripts/azure/ssn_prepare.py | 4 +++-
7 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
index 983bbfc..53d9eb5 100644
--- a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
@@ -1083,8 +1083,9 @@ def configure_local_spark(jars_dir, templates_dir, memory_type='driver'):
except:
spark_jars_paths = None
user_storage_account_tag = os.environ['conf_service_base_name'] + '-' + (os.environ['project_name'].lower().replace('_', '-')).\
- replace('_', '-') + '-storage'
- shared_storage_account_tag = os.environ['conf_service_base_name'] + '-shared-storage'
+ replace('_', '-') + '-' + os.environ['endpoint_name'].lower().replace('_', '-') + '-storage'
+ shared_storage_account_tag = '{0}-{1}-shared-storage'.format(os.environ['conf_service_base_name'],
+ os.environ['endpoint_name'])
for storage_account in meta_lib.AzureMeta().list_storage_accounts(os.environ['azure_resource_group_name']):
if user_storage_account_tag == storage_account.tags["Name"]:
user_storage_account_name = storage_account.name
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_download_git_certfile.py b/infrastructure-provisioning/src/general/scripts/azure/common_download_git_certfile.py
index 70c08d5..cfe37fc 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_download_git_certfile.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_download_git_certfile.py
@@ -35,7 +35,8 @@ parser.add_argument('--os_user', type=str, default='')
args = parser.parse_args()
resource_group_name = os.environ['azure_resource_group_name']
-ssn_storage_account_tag = os.environ['conf_service_base_name'] + '-ssn-storage'
+ssn_storage_account_tag = ('{0}-{1}-{2}-storage'.format(os.environ['conf_service_base_name'], os.environ['project_name'],
+ os.environ['endpoint_name']))
container_name = ('{}-ssn-container'.format(os.environ['conf_service_base_name'])).lower().replace('_', '-')
gitlab_certfile = os.environ['conf_gitlab_certfile']
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index de87849..6307fcd 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -45,7 +45,7 @@ if __name__ == "__main__":
edge_conf['region'] = os.environ['azure_region']
edge_conf['subnet_name'] = os.environ['azure_subnet_name']
edge_conf['project_name'] = os.environ['project_name'].lower().replace('_', '-')
- edge_conf['endpoint_name'] = (os.environ['endpoint_name']).lower().replace('_', '-')
+ edge_conf['endpoint_name'] = os.environ['endpoint_name'].lower().replace('_', '-')
edge_conf['user_keyname'] = os.environ['project_name']
edge_conf['private_subnet_name'] = edge_conf['service_base_name'] + '-' + edge_conf['project_name'] + '-subnet'
edge_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
@@ -57,11 +57,13 @@ if __name__ == "__main__":
edge_conf['primary_disk_name'] = edge_conf['instance_name'] + '-disk0'
edge_conf['instance_dns_name'] = 'host-' + edge_conf['instance_name'] + '.' + edge_conf['region'] + \
'.cloudapp.azure.com'
- edge_conf['user_storage_account_name'] = edge_conf['service_base_name'] + '-' + edge_conf[
- 'project_name'] + '-storage'
+ edge_conf['user_storage_account_name'] = '{0}-{1}-{2}-storage'.format(edge_conf['service_base_name'],
+ edge_conf['project_name'],
+ edge_conf['endpoint_name'])
edge_conf['user_container_name'] = (edge_conf['service_base_name'] + '-' + edge_conf['project_name'] +
'-container').lower()
- edge_conf['shared_storage_account_name'] = edge_conf['service_base_name'] + '-shared-storage'
+ edge_conf['shared_storage_account_name'] = '{0}-{1}-shared-storage'.format(edge_conf['service_base_name'],
+ edge_conf['endpoint_name'])
edge_conf['shared_container_name'] = (edge_conf['service_base_name'] + '-shared-container').lower()
edge_conf['datalake_store_name'] = edge_conf['service_base_name'] + '-ssn-datalake'
edge_conf['datalake_shared_directory_name'] = edge_conf['service_base_name'] + '-shared-folder'
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
index c70aedd..0f00ce2 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
@@ -43,6 +43,7 @@ if __name__ == "__main__":
edge_conf['service_base_name'] = os.environ['conf_service_base_name']
edge_conf['resource_group_name'] = os.environ['azure_resource_group_name']
edge_conf['user_name'] = os.environ['edge_user_name'].replace('_', '-')
+ edge_conf['endpoint_name'] = os.environ['endpoint_name'].replace('_', '-')
edge_conf['azure_ad_user_name'] = os.environ['azure_iam_user']
edge_conf['key_name'] = os.environ['conf_key_name']
edge_conf['user_keyname'] = os.environ['edge_user_name']
@@ -66,8 +67,9 @@ if __name__ == "__main__":
+ edge_conf['user_name'] + '-dataengine-master-sg'
edge_conf['slave_security_group_name'] = edge_conf['service_base_name'] + '-' \
+ edge_conf['user_name'] + '-dataengine-slave-sg'
- edge_conf['edge_storage_account_name'] = edge_conf['service_base_name'] + '-' + edge_conf['user_name'] + \
- '-storage'
+ edge_conf['edge_storage_account_name'] = ('{0}-{1}-{2}-storage'.format(edge_conf['service_base_name'],
+ edge_conf['user_name'],
+ edge_conf['endpoint_name']))
edge_conf['edge_container_name'] = (edge_conf['service_base_name'] + '-' + edge_conf['user_name'] +
'-container').lower()
edge_conf['datalake_store_name'] = edge_conf['service_base_name'] + '-ssn-datalake'
diff --git a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index 3fe0ecc..f2451f9 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -44,6 +44,7 @@ if __name__ == "__main__":
project_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-')
project_conf['project_tag'] = (os.environ['project_name']).lower().replace('_', '-')
project_conf['endpoint_tag'] = (os.environ['endpoint_name']).lower().replace('_', '-')
+ project_conf['endpoint_name'] = (os.environ['endpoint_name']).lower().replace('_', '-')
project_conf['resource_group_name'] = os.environ['azure_resource_group_name']
project_conf['azure_ad_user_name'] = os.environ['azure_iam_user']
@@ -72,8 +73,9 @@ if __name__ == "__main__":
+ project_conf['project_name'] + '-dataengine-master-sg'
project_conf['slave_security_group_name'] = project_conf['service_base_name'] + '-' \
+ project_conf['project_name'] + '-dataengine-slave-sg'
- project_conf['edge_storage_account_name'] = project_conf['service_base_name'] + '-' + project_conf['project_name'] + \
- '-storage'
+ project_conf['edge_storage_account_name'] = '{0}-{1}-{2}-storage'.format(project_conf['service_base_name'],
+ project_conf['project_name'],
+ project_conf['endpoint_name'])
project_conf['edge_container_name'] = (project_conf['service_base_name'] + '-' + project_conf['project_name'] +
'-container').lower()
project_conf['datalake_store_name'] = project_conf['service_base_name'] + '-ssn-datalake'
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index c8abf81..b666da0 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -57,7 +57,9 @@ if __name__ == "__main__":
ssn_conf['region'] = os.environ['azure_region']
ssn_conf['ssn_storage_account_name'] = '{}-ssn-storage'.format(ssn_conf['service_base_name'])
ssn_conf['ssn_container_name'] = '{}-ssn-container'.format(ssn_conf['service_base_name']).lower()
- ssn_conf['shared_storage_account_name'] = '{}-shared-storage'.format(ssn_conf['service_base_name'])
+ ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
+ ssn_conf['shared_storage_account_name'] = '{0}-{1}-shared-storage'.format(ssn_conf['service_base_name'],
+ ssn_conf['default_endpoint_name'])
ssn_conf['shared_container_name'] = '{}-shared-container'.format(ssn_conf['service_base_name']).lower()
ssn_conf['datalake_store_name'] = '{}-ssn-datalake'.format(ssn_conf['service_base_name'])
ssn_conf['datalake_shared_directory_name'] = '{}-shared-folder'.format(ssn_conf['service_base_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
index 60bac84..e9dff4d 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
@@ -64,7 +64,9 @@ if __name__ == "__main__":
ssn_conf['ssn_image_name'] = os.environ['azure_{}_image_name'.format(os.environ['conf_os_family'])]
ssn_conf['ssn_storage_account_name'] = '{}-ssn-storage'.format(ssn_conf['service_base_name'])
ssn_conf['ssn_container_name'] = '{}-ssn-container'.format(ssn_conf['service_base_name']).lower()
- ssn_conf['shared_storage_account_name'] = '{}-shared-storage'.format(ssn_conf['service_base_name'])
+ ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
+ ssn_conf['shared_storage_account_name'] = '{0}-{1}-shared-storage'.format(ssn_conf['service_base_name'],
+ ssn_conf['default_endpoint_name'])
ssn_conf['shared_container_name'] = '{}-shared-container'.format(ssn_conf['service_base_name']).lower()
ssn_conf['datalake_store_name'] = '{}-ssn-datalake'.format(ssn_conf['service_base_name'])
ssn_conf['datalake_shared_directory_name'] = '{}-shared-folder'.format(ssn_conf['service_base_name'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 08/08: fix typo
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6c2f41fe4a211479c19c1e83e7e82aaf10f3c007
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Fri Oct 11 16:49:38 2019 +0300
fix typo
---
infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf | 2 +-
infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf b/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
index 5e1233d..012e217 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
@@ -22,7 +22,7 @@
locals {
endpoint_policy_name = "${var.service_base_name}-${var.endpoint_id}-endpoint-policy"
endpoint_role_name = "${var.service_base_name}-${var.endpoint_id}-endpoint_role"
- service_account_name = "${var.service_base_name}-${var.endpoint_id}-et"
+ service_account_name = "${var.service_base_name}-${var.endpoint_id}-endt"
}
resource "google_service_account" "endpoint_sa" {
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
index 75ef7e4..b4bfc54 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
@@ -128,7 +128,6 @@ variable "endpoint_roles" {
"roles/iam.roleAdmin",
"roles/compute.instanceAdmin",
"roles/bigquery.dataViewer",
- "roles/compute.networkUser",
"roles/bigquery.jobUser"
]
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/08: Added compute.networks.get permission into
GCP Enpoint.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0f480e89221e418156514fc11be6b24cfb66ac59
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Wed Oct 9 17:25:02 2019 +0300
Added compute.networks.get permission into GCP Enpoint.
---
infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
index 1b6a2cb..b4bfc54 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
@@ -106,6 +106,7 @@ variable "endpoint_policies" {
"compute.images.get",
"compute.images.list",
"compute.images.setLabels",
+ "compute.networks.get",
"compute.networks.create",
"compute.networks.delete",
"compute.networks.updatePolicy",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/08: Added roles/compute.networkUser to GCP
Endpoint roles.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f72ef5398d97d4b843a77ff58699b55c261cc03c
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Thu Oct 10 11:22:18 2019 +0300
Added roles/compute.networkUser to GCP Endpoint roles.
---
infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
index b4bfc54..75ef7e4 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
@@ -128,6 +128,7 @@ variable "endpoint_roles" {
"roles/iam.roleAdmin",
"roles/compute.instanceAdmin",
"roles/bigquery.dataViewer",
+ "roles/compute.networkUser",
"roles/bigquery.jobUser"
]
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/08: Name of Endpoint SA is set to max 28
symbols.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit cda71d8a14faa5ce3e278c82f2b1e1d39ac2aa50
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Thu Oct 10 12:27:22 2019 +0300
Name of Endpoint SA is set to max 28 symbols.
---
infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf b/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
index 41587fa..5e1233d 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/iam.tf
@@ -22,7 +22,7 @@
locals {
endpoint_policy_name = "${var.service_base_name}-${var.endpoint_id}-endpoint-policy"
endpoint_role_name = "${var.service_base_name}-${var.endpoint_id}-endpoint_role"
- service_account_name = "${var.service_base_name}-${var.endpoint_id}-endpoint-sa"
+ service_account_name = "${var.service_base_name}-${var.endpoint_id}-et"
}
resource "google_service_account" "endpoint_sa" {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org