Merge pull request #4 from iquzart/development

closed #3

Author: iquzart

expire_resources/__init__.py

@@ -7,7 +7,8 @@
 from azure.common.credentials import (ServicePrincipalCredentials, get_azure_cli_credentials)
 from azure.mgmt.resource import ResourceManagementClient
 
-from .resource_ops import (resource_extractor, check_managed_resource_status)
+
+from .resource_ops import (resource_extractor, check_managed_resource_status, check_rg_availability)
 from .util import tabulate_report
 from .trigger_pipeline import trigger_pipelines
 
@@ -27,11 +28,15 @@ async def main(mytimer: func.TimerRequest) -> None:
     # Obtain the management object for resources.
     resource_client = ResourceManagementClient(credential, subscription_id)
 
+    # managed resource groups provided on env
     managed_resource_groups = os.environ["RESOURCE_GROUPS"].split(",")
-   
+    
+    managed_resource_groups = check_rg_availability(resource_client, managed_resource_groups)
+
     managed_resources = []
     for managed_resource_group in managed_resource_groups:
         resources = resource_client.resources.list_by_resource_group(managed_resource_group)
+
         for resource in resources:
             if (resource.tags != None) and ('ExpiryDate' in resource.tags):   
                 try:

expire_resources/function.json

@@ -5,7 +5,7 @@
       "name": "mytimer",
       "type": "timerTrigger",
       "direction": "in",
-      "schedule": "0 */15 * * * *"
+      "schedule": "0 */5 * * * *"
     }
   ]
 }

expire_resources/resource_ops.py

@@ -1,7 +1,20 @@
 import pytz
 import logging
 from datetime import datetime
+from azure.mgmt.resource import ResourceManagementClient
 
+def check_rg_availability(resource_client, managed_resource_groups):
+    """
+    Check the resource group provided is available in Azure environment
+    """
+    # Get list of all resource groups
+    all_resource_groups = []
+    for resource_group in resource_client.resource_groups.list():
+        all_resource_groups.append(resource_group.name)
+   
+    # update managed resource group with existing 
+    m_rgs =  list(set(all_resource_groups).intersection(set(managed_resource_groups)))
+    return m_rgs
 
 def resource_extractor(resource, type):
     """

expire_resources/util.py

@@ -7,5 +7,5 @@ def tabulate_report(data):
     """    
     header = data[0].keys()
     rows =  [x.values() for x in data]
-    return (tabulate.tabulate(rows, header,  tablefmt='grid'))
+    return (tabulate.tabulate(rows, header))