yellowdog-python-examples 7.4.9__tar.gz → 7.4.10__tar.gz

{yellowdog-python-examples-7.4.9/yellowdog_python_examples.egg-info → yellowdog-python-examples-7.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowdog-python-examples
-Version: 7.4.9
+Version: 7.4.10
 Summary: Example Python commands using the YellowDog Python SDK
 Home-page: https://github.com/yellowdog/python-examples
 Author: YellowDog Limited

yellowdog-python-examples-7.4.10/yd_commands/__init__.py

@@ -0,0 +1 @@
+__version__ = "7.4.10"

{yellowdog-python-examples-7.4.9 → yellowdog-python-examples-7.4.10}/yd_commands/azure_cloudwizard.py

@@ -88,7 +88,7 @@ class AzureConfig(CommonCloudConfig):
             YD_DEFAULT_INSTANCE_TYPE if instance_type is None else instance_type
         )
         self._selected_regions: List[str] = []
-        self._resource_groups: List[str] = []
+        self._created_regions: List[str] = []
         self._subscription_id = environ[AZURE_SUBSCRIPTION_ID]
         self._resource_client = ResourceManagementClient(
             self._credential, self._subscription_id
@@ -133,7 +133,7 @@ class AzureConfig(CommonCloudConfig):
         print_log("Creating YellowDog resources in the Azure account")
         print_log(
             "Please select the Azure regions in which to create resource groups and"
-            " network resources."
+            " network resources"
         )
         print_log(
             "*** Note that only the following region(s) contain"
@@ -166,11 +166,6 @@ class AzureConfig(CommonCloudConfig):
         if self._storage_region not in regions:
             regions.append(self._storage_region)
             storage_region_added = True
-            rg_name = self._generate_resource_group_name(self._storage_region)
-            resource_group_added_msg = (
-                f"Note: Resource group '{rg_name}' is added in order to contain the"
-                " Azure storage account"
-            )
         else:
             storage_region_added = False
 
@@ -180,14 +175,15 @@ class AzureConfig(CommonCloudConfig):
             # Does the resource group already exist?
             try:
                 if self._resource_client.resource_groups.check_existence(rg_name):
-                    print_warning(f"Azure resource group '{rg_name}' already exists")
-                    self._resource_groups.append(rg_name)
                     if region == self._storage_region and storage_region_added:
-                        print_log(resource_group_added_msg)
                         continue
-                    self._create_network_resources(
+                    print_warning(f"Azure resource group '{rg_name}' already exists")
+                    if self._create_network_resources(
                         resource_group_name=rg_name, region=region
-                    )
+                    ):
+                        self._created_regions.append(region)
+                    else:
+                        self._remove_resource_group_by_name(rg_name)
                     continue
             except Exception as e:
                 print_warning(
@@ -201,22 +197,44 @@ class AzureConfig(CommonCloudConfig):
                 rg_result = self._resource_client.resource_groups.create_or_update(
                     rg_name, {"location": region}
                 )
-                self._resource_groups.append(rg_name)
                 print_log(
                     f"Created (or updated) Azure resource group '{rg_result.name}' in"
                     f" region '{rg_result.location}'"
                 )
                 if region == self._storage_region and storage_region_added:
-                    print_log(resource_group_added_msg)
+                    print_log(
+                        f"Note: Resource group '{rg_name}' is automatically created to"
+                        " contain the Azure storage account"
+                    )
                     continue
-                self._create_network_resources(
+                if self._create_network_resources(
                     resource_group_name=rg_name, region=region
-                )
+                ):
+                    self._created_regions.append(region)
+                else:
+                    self._remove_resource_group_by_name(rg_name)
+
             except Exception as e:
-                print_error(
-                    f"Failed to create Azure resource group '{rg_name}' in region"
-                    f" '{region}': {e}"
-                )
+                if "LocationNotAvailable" in str(e):
+                    print_warning(
+                        f"Region '{region}' is not available for Resource Group"
+                        " creation; excluding this region"
+                    )
+                elif "DisallowedLocation" in str(e):
+                    print_warning(
+                        f"Region '{region}' is disallowed for Resource Group"
+                        " creation; excluding this region"
+                    )
+                elif "ResourceGroupBeingDeleted" in str(e):
+                    print_warning(
+                        f"Existing Resource Group '{rg_name}' is in the process of"
+                        " being deleted; please try again later"
+                    )
+                else:
+                    print_error(
+                        f"Failed to create Azure resource group '{rg_name}' in region"
+                        f" '{region}': {e}"
+                    )
                 continue
 
     def _remove_resource_groups(self):
@@ -244,10 +262,17 @@ class AzureConfig(CommonCloudConfig):
                         )
                         count += 1
                     except Exception as e:
-                        print_error(
-                            "Unable to delete Azure resource group"
-                            f" '{resource_group.name}': {e}"
-                        )
+                        if "ResourceGroupNotFound" in str(e):
+                            print_warning(
+                                f"Resource Group '{resource_group.name}' not found; it"
+                                " may have already been in the process of being"
+                                " deleted"
+                            )
+                        else:
+                            print_error(
+                                "Unable to delete Azure resource group"
+                                f" '{resource_group.name}': {e}"
+                            )
                         continue
 
         if count == 0:
@@ -255,10 +280,42 @@ class AzureConfig(CommonCloudConfig):
         else:
             print_log(f"{count} Azure resource group(s) deleted")
 
+    def _remove_resource_group_by_name(self, rg_name: str):
+        """
+        Remove a resource group by its name.
+        """
+        try:
+            self._resource_client.resource_groups.begin_delete(rg_name)
+            print_log(f"Requested deletion of Azure resource group '{rg_name}'")
+        except:
+            print_warning(f"Unable to delete Azure resource group '{rg_name}'")
+
     def _create_network_resources(self, resource_group_name: str, region: str):
         """
         Create a virtual network and subnet in a resource group in a region.
         """
+
+        def _location_not_available_for_resource_type(
+            e: Exception, resource_name: str
+        ) -> bool:
+            if "LocationNotAvailableForResourceType" in str(e):
+                print_warning(
+                    f"Location '{region}' is not available for creation of resource"
+                    f" '{resource_name}'; excluding this region"
+                )
+                return True
+            return False
+
+        def _resource_group_being_deleted(e: Exception, resource_name: str) -> bool:
+            if "ResourceGroupBeingDeleted" in str(e):
+                print_warning(
+                    f"Resource Group '{resource_group_name}' is in the process of being"
+                    f" deleted and resource '{resource_name}' cannot be created;"
+                    " excluding this region"
+                )
+                return True
+            return False
+
         vnet_name = self._generate_vnet_name(region)
         address_prefixes = [ADDRESS_PREFIX]
         try:
@@ -275,8 +332,13 @@ class AzureConfig(CommonCloudConfig):
                 f" prefixes {address_prefixes}"
             )
         except Exception as e:
-            print_error(f"Failed to create Azure virtual network '{vnet_name}': {e}")
-            return
+            if _location_not_available_for_resource_type(e, vnet_name):
+                return False
+            if not _resource_group_being_deleted(e, vnet_name):
+                print_error(
+                    f"Failed to create Azure virtual network '{vnet_name}': {e}"
+                )
+            return False
 
         # Create network security group
         security_group_name = self._generate_security_group_name(region)
@@ -293,19 +355,23 @@ class AzureConfig(CommonCloudConfig):
                 f" '{security_group_name}'"
             )
         except Exception as e:
-            print_error(
-                "Unable to create Azure network security group"
-                f" '{security_group_name}': {e}"
-            )
-            return
+            if _location_not_available_for_resource_type(e, security_group_name):
+                return False
+            if not _resource_group_being_deleted(e, security_group_name):
+                print_error(
+                    "Unable to create Azure network security group"
+                    f" '{security_group_name}': {e}"
+                )
+            return False
 
         # Add an outbound HTTPS rule to allow the Agent to reach the platform
         address_prefix = ADDRESS_PREFIX
+        security_rule_name = "https-outbound-rule"
         try:
             self._network_client.security_rules.begin_create_or_update(
                 resource_group_name=resource_group_name,
                 network_security_group_name=security_group_name,
-                security_rule_name="https-outbound",
+                security_rule_name=security_rule_name,
                 security_rule_parameters={
                     "properties": {
                         "access": "Allow",
@@ -324,10 +390,14 @@ class AzureConfig(CommonCloudConfig):
                 f" '{security_group_name}'"
             )
         except Exception as e:
-            print_error(
-                "Unable to add outbound HTTPS rule to Azure security group"
-                f" '{security_group_name}': {e}"
-            )
+            if _location_not_available_for_resource_type(e, security_rule_name):
+                return False
+            if not _resource_group_being_deleted(e, security_rule_name):
+                print_error(
+                    "Unable to add outbound HTTPS rule to Azure security group"
+                    f" '{security_group_name}': {e}"
+                )
+            return False
 
         # Create subnet and associate the security group
         subnet_name = self._generate_subnet_name(region)
@@ -355,8 +425,13 @@ class AzureConfig(CommonCloudConfig):
                 f" '{address_prefix}'"
             )
         except Exception as e:
-            print_error(f"Failed to create Azure subnet '{subnet_name}': {e}")
-            return
+            if _location_not_available_for_resource_type(e, subnet_name):
+                return False
+            if not _resource_group_being_deleted(e, subnet_name):
+                print_error(f"Failed to create Azure subnet '{subnet_name}': {e}")
+            return False
+
+        return True
 
     def _create_yellowdog_resources(self):
         """
@@ -364,7 +439,7 @@ class AzureConfig(CommonCloudConfig):
         """
         print_log("Creating Azure resources in the YellowDog account")
 
-        for region in self._selected_regions:
+        for region in self._created_regions:
             name = f"{YD_RESOURCE_PREFIX}-{region}-ondemand"
             self._source_template_resources.append(
                 self._generate_azure_compute_source_template(
@@ -607,7 +682,7 @@ class AzureConfig(CommonCloudConfig):
         self, keyring_name: str, credential_name: str
     ) -> Dict:
         """
-        Generate an Azure Credential resource definition.
+        Generate an Azure Storage Credential resource definition.
         """
         return {
             "resource": "Credential",
@@ -708,9 +783,11 @@ class AzureConfig(CommonCloudConfig):
         Generate the list of regions supported by this subscription.
         """
         try:
-            locations = self._subscription_client.subscriptions.list_locations(
-                self._subscription_id
-            )
-            return [location.name for location in locations]
+            return [
+                location.name
+                for location in self._subscription_client.subscriptions.list_locations(
+                    self._subscription_id
+                )
+            ]
         except Exception as e:
             raise Exception(f"Unable to obtain list of Azure regions: {e}")

{yellowdog-python-examples-7.4.9 → yellowdog-python-examples-7.4.10/yellowdog_python_examples.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowdog-python-examples
-Version: 7.4.9
+Version: 7.4.10
 Summary: Example Python commands using the YellowDog Python SDK
 Home-page: https://github.com/yellowdog/python-examples
 Author: YellowDog Limited

yellowdog-python-examples-7.4.9/yd_commands/__init__.py

@@ -1 +0,0 @@
-__version__ = "7.4.9"