You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by my...@apache.org on 2021/07/27 08:54:11 UTC

[incubator-datalab] branch DATALAB-2409 updated (f50b62f -> e89a155)

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

mykolabodnar pushed a change to branch DATALAB-2409
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.


    from f50b62f  [DATALAB-2409] - [AWS] SSN prepare refactored
     new ded97f9  [DATALAB-2409] - [AWS] SSN prepare refactored
     new e89a155  [DATALAB-2409] - [AWS] SSN prepare refactored

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/general/scripts/aws/ssn_prepare.py         | 43 +++++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org


[incubator-datalab] 02/02: [DATALAB-2409] - [AWS] SSN prepare refactored

Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mykolabodnar pushed a commit to branch DATALAB-2409
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit e89a1558b722b7e2f5b878ed0b9c05d532a8a76a
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Tue Jul 27 11:53:57 2021 +0300

    [DATALAB-2409] - [AWS] SSN prepare refactored
---
 .../src/general/scripts/aws/ssn_prepare.py         | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
index 05ea766..6af3c59 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
@@ -1,3 +1,26 @@
+#!/usr/bin/python3
+
+# *****************************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# ******************************************************************************
+
 import datalab.fab
 import datalab.actions_lib
 import datalab.meta_lib

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org


[incubator-datalab] 01/02: [DATALAB-2409] - [AWS] SSN prepare refactored

Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mykolabodnar pushed a commit to branch DATALAB-2409
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit ded97f91879d39abf4fdc77b2b7fe5edfb697897
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Tue Jul 27 11:52:02 2021 +0300

    [DATALAB-2409] - [AWS] SSN prepare refactored
---
 .../src/general/scripts/aws/ssn_prepare.py           | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
index d930acc..05ea766 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
@@ -128,7 +128,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create secondary VPC", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     #creating subnet
@@ -154,7 +154,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create Subnet", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     #creating peering connection
@@ -170,7 +170,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create peering connection", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     #creating security groups
@@ -235,7 +235,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create security group for SSN", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     #creating roles
@@ -254,7 +254,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create roles", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     #creating endpoint and rout-table
@@ -270,7 +270,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create endpoint", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     # creating endpoint and rout-table notebook vpc
@@ -288,7 +288,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create secondary endpoint", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     #creating ssn instance
@@ -309,7 +309,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create ssn instance", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     #associating elastic ip
@@ -331,7 +331,7 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create elastic ip", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
 
     #creating route53 records
@@ -353,5 +353,5 @@ if __name__ == "__main__":
     except Exception as err:
         logging.error('Error: {0}'.format(err))
         datalab.fab.append_result("Failed to create route53 record", str(err))
-        remove_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
+        cleanup_aws_cloud_resources(ssn_conf['tag_name'], ssn_conf['service_base_name'])
         sys.exit(1)
\ No newline at end of file

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org