This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch DLAB-1622
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit d8dda871cd7945fd39070ec97a3cc0031a688fed
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Mar 11 17:28:03 2020 +0200

    [DLAB-1622]: Fixed issue with storage and container name in Azure
---
 .../src/general/scripts/azure/project_prepare.py     | 20 ++++++++++----------
 .../terraform/azure/endpoint/main/bucket.tf          |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py 
b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index 511c8f4..e2d481d 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -89,12 +89,12 @@ if __name__ == "__main__":
         project_conf['slave_security_group_name'] = 
'{}-{}-{}-de-slave-sg'.format(project_conf['service_base_name'],
                                                                                
   project_conf['project_name'],
                                                                                
   project_conf['endpoint_name'])
-        project_conf['edge_storage_account_name'] = 
'{0}-{1}-{2}-bucket'.format(project_conf['service_base_name'],
-                                                                               
 project_conf['project_name'],
-                                                                               
 project_conf['endpoint_name'])
-        project_conf['edge_container_name'] = 
'{0}-{1}-{2}-bucket'.format(project_conf['service_base_name'],
-                                                                          
project_conf['project_name'],
-                                                                          
project_conf['endpoint_name'])
+        project_conf['edge_storage_account_name'] = 
('{0}-{1}-{2}-bucket'.format(project_conf['service_base_name'],
+                                                                               
  project_conf['project_name'],
+                                                                               
  project_conf['endpoint_name'])).lower()
+        project_conf['edge_container_name'] = 
('{0}-{1}-{2}-bucket'.format(project_conf['service_base_name'],
+                                                                           
project_conf['project_name'],
+                                                                           
project_conf['endpoint_name'])).lower()
         project_conf['datalake_store_name'] = 
'{}-ssn-datalake'.format(project_conf['service_base_name'])
         project_conf['datalake_user_directory_name'] = 
'{0}-{1}-{2}-folder'.format(project_conf['service_base_name'],
                                                                                
    project_conf['project_name'],
@@ -117,10 +117,10 @@ if __name__ == "__main__":
                                                     
os.environ['conf_billing_tag_value'],
                                                 project_conf['tag_name']: 
project_conf['edge_storage_account_name']}
         project_conf['primary_disk_size'] = '32'
-        project_conf['shared_storage_account_name'] = 
'{0}-{1}-shared-bucket'.format(project_conf['service_base_name'],
-                                                                               
      project_conf['endpoint_name'])
-        project_conf['shared_container_name'] = 
'{}-{}-shared-bucket'.format(project_conf['service_base_name'],
-                                                                             
project_conf['endpoint_name'])
+        project_conf['shared_storage_account_name'] = 
('{0}-{1}-shared-bucket'.format(
+            project_conf['service_base_name'], 
project_conf['endpoint_name'])).lower()
+        project_conf['shared_container_name'] = 
('{}-{}-shared-bucket'.format(project_conf['service_base_name'],
+                                                                              
project_conf['endpoint_name'])).lower()
         project_conf['shared_storage_account_tags'] = {"Name": 
project_conf['shared_storage_account_name'],
                                                        "SBN": 
project_conf['service_base_name'],
                                                        
os.environ['conf_billing_tag_key']: os.environ[
diff --git 
a/infrastructure-provisioning/terraform/azure/endpoint/main/bucket.tf 
b/infrastructure-provisioning/terraform/azure/endpoint/main/bucket.tf
index f2c0cc7..a44a37f 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/bucket.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/bucket.tf
@@ -20,7 +20,7 @@
 # 
******************************************************************************
 
 locals {
- shared_bucket_name = 
"${var.service_base_name}-${var.endpoint_id}-shared-bucket"
+ shared_bucket_name = 
lower("${var.service_base_name}-${var.endpoint_id}-shared-bucket")
 }
 
 resource "random_string" "shared_bucket_service_name" {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to