Merge branch 'main' into staging-nlm-update

mahimab1 · mahimab1 · commit 89c91be99b86 · 2025-07-22T13:34:36.000-04:00
diff --git a/.github/workflows/healthcheck-app-existingVnet-Lin-Thurs.yml b/.github/workflows/healthcheck-app-existingVnet-Lin-Thurs.yml
@@ -6,18 +6,19 @@
 name: MATLAB Web App Server Ref Arch Azure Existing Virtual Network Health Check Test on linux in Japan East
 
 on:
+ workflow_dispatch:
  schedule:
-    - cron: '0 16 * * 4'
+    - cron: '0 12 * * 4'
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python 3.13
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.13'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -33,5 +34,5 @@ jobs:
     - name: MWAS ref Arch Existing Virtual Network Health check test on linux in Japan East.
       run: |
         cd healthcheck
-        python healthcheck_webapps_refarch.py ${{ secrets.TenantId }} ${{ secrets.ClientId }} ${{ secrets.ClientSecret }} ${{ secrets.SubscriptionId }} ${{ secrets.username }} ${{ secrets.password }} ${{ secrets.ipaddress }} ${{ secrets.sslcertificate }} ${{ secrets.sslkey }} "japaneast" "Linux" "true"
+        python healthcheck_webapps_refarch.py ${{ secrets.TenantId }} ${{ secrets.ClientId }} ${{ secrets.ClientSecret }} ${{ secrets.SubscriptionId }} ${{ secrets.username }} ${{ secrets.password }} ${{ secrets.sslcertificate }} ${{ secrets.sslkey }} "japaneast" "Linux" "true"
 
diff --git a/.github/workflows/healthcheck-app-existingVnet-Win-Tue.yml b/.github/workflows/healthcheck-app-existingVnet-Win-Tue.yml
@@ -6,6 +6,7 @@
 name: MATLAB Web App Server Ref Arch Azure Existing Virtual Network Health Check Test on Windows in West Eu
 
 on:
+ workflow_dispatch:
  schedule:
     - cron: '0 16 * * 2'
 jobs:
@@ -14,10 +15,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python 3.13
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.13'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -33,5 +34,5 @@ jobs:
     - name: MWAS ref Arch Existing Virtual Network Health check test on Windows in West Eu
       run: |
         cd healthcheck
-        python healthcheck_webapps_refarch.py ${{ secrets.TenantId }} ${{ secrets.ClientId }} ${{ secrets.ClientSecret }} ${{ secrets.SubscriptionId }} ${{ secrets.username }} ${{ secrets.password }} ${{ secrets.ipaddress }} ${{ secrets.sslcertificate }} ${{ secrets.sslkey }} "westeurope" "Windows" "true"
+        python healthcheck_webapps_refarch.py ${{ secrets.TenantId }} ${{ secrets.ClientId }} ${{ secrets.ClientSecret }} ${{ secrets.SubscriptionId }} ${{ secrets.username }} ${{ secrets.password }} ${{ secrets.sslcertificate }} ${{ secrets.sslkey }} "westeurope" "Windows" "true"
 
diff --git a/.github/workflows/healthcheck-app-newVnet-Lin-Wed.yml b/.github/workflows/healthcheck-app-newVnet-Lin-Wed.yml
@@ -1,11 +1,11 @@
 # This workflow will install Python dependencies, run tests and lint with a single version of Python
 # For more information, see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
 # The following workflow file triggers the New Virtual Network deployment test "test_refarch_new" every Wednesday with platform as "Linux" in "westus" region.
 
 name: MATLAB Web App Server Ref Arch Azure Health Check Test on Linux in West US
 
 on:
+ workflow_dispatch:
  schedule:
     - cron: '0 16 * * 3'
 jobs:
@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python 3.13
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.13'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -33,5 +33,5 @@ jobs:
     - name: Web App ref Arch New Virtual Network Health check test on Linux in West US
       run: |
         cd healthcheck
-        python healthcheck_webapps_refarch.py ${{ secrets.TenantId }} ${{ secrets.ClientId }} ${{ secrets.ClientSecret }} ${{ secrets.SubscriptionId }} ${{ secrets.username }} ${{ secrets.password }} ${{ secrets.ipaddress }} ${{ secrets.sslcertificate }} ${{ secrets.sslkey }} "westus" "Linux" "false"
+        python healthcheck_webapps_refarch.py ${{ secrets.TenantId }} ${{ secrets.ClientId }} ${{ secrets.ClientSecret }} ${{ secrets.SubscriptionId }} ${{ secrets.username }} ${{ secrets.password }} ${{ secrets.sslcertificate }} ${{ secrets.sslkey }} "westus" "Linux" "false"
 
diff --git a/.github/workflows/healthcheck-app-newVnet-Win-Mon.yml b/.github/workflows/healthcheck-app-newVnet-Win-Mon.yml
@@ -6,6 +6,7 @@
 name: MATLAB Web App Server Ref Arch Azure Health Check Test on Windows in East US region
 
 on:
+ workflow_dispatch:
  push:
  schedule:
     - cron: '0 16 * * 1'
@@ -15,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python 3.13
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.13'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -34,5 +35,5 @@ jobs:
     - name: Web App ref Arch New Virtual Network Health check test on Windows in East US region
       run: |
         cd healthcheck
-        python healthcheck_webapps_refarch.py ${{ secrets.TenantId }} ${{ secrets.ClientId }} ${{ secrets.ClientSecret }} ${{ secrets.SubscriptionId }} ${{ secrets.username }} ${{ secrets.password }} ${{ secrets.ipaddress }} ${{ secrets.sslcertificate }} ${{ secrets.sslkey }} "eastus" "Windows" "false"
+        python healthcheck_webapps_refarch.py ${{ secrets.TenantId }} ${{ secrets.ClientId }} ${{ secrets.ClientSecret }} ${{ secrets.SubscriptionId }} ${{ secrets.username }} ${{ secrets.password }} ${{ secrets.sslcertificate }} ${{ secrets.sslkey }} "eastus" "Windows" "false"
 
diff --git a/healthcheck/healthcheck_webapps_refarch.py b/healthcheck/healthcheck_webapps_refarch.py
@@ -11,8 +11,9 @@
 import testtools.AzureAuthentication as AzureAuth
 import testtools.deploy as DeployOp
 from azure.mgmt.network import NetworkManagementClient
+from azure.mgmt.network.models import ServiceEndpointPropertiesFormat, Subnet
 
-def main(tenant_id_arg, client_id_arg, client_secret_arg, subscription_id_arg, username, password, ipAddress, sslCertificate, sslPrivateKey, location_arg, platform_arg, existingVPC):
+def main(tenant_id_arg, client_id_arg, client_secret_arg, subscription_id_arg, username, password, sslCertificate, sslPrivateKey, location_arg, platform_arg, existingVPC):
 
     # Deploy template
     # Reference architecture in production.
@@ -25,25 +26,40 @@ def main(tenant_id_arg, client_id_arg, client_secret_arg, subscription_id_arg, u
     credentials = AzureAuth.authenticate_client_key(tenant_id, client_id, client_secret)
     subscription_id = subscription_id_arg
     location = location_arg
+    ipAddress = requests.get("https://api.ipify.org").text + "/32"
 
     if existingVPC=='true':
-        print('yes')
         # Subnets & virtual network info
         subnets_cidr = ['10.1.0.0/24']
         vnet_cidr = '10.1.0.0/16'
         # Resource group where virtual network is created
         resource_name_vnet = 'vnet_resource_group'
         # Deploy a resource group with a virtual network and specified number of subnets
         try:
-            subnet_name, vnet_name = DeployOp.create_vnet(credentials,
+            subnet_name_list, vnet_name = DeployOp.create_vnet(credentials,
                                                             subscription_id,
                                                             location,
                                                             subnets_cidr,
                                                             resource_name_vnet,
                                                             vnet_cidr)
+            subnet_name = subnet_name_list[0]
+            network_client = NetworkManagementClient(credentials, subscription_id)
+            # Add service endpoint to subnets
+            subnet = network_client.subnets.get(resource_name_vnet, vnet_name, subnet_name)
+            if not subnet.service_endpoints:
+                subnet.service_endpoints = []
+            subnet.service_endpoints.append(
+                ServiceEndpointPropertiesFormat(service='Microsoft.Storage')
+            )
+            updated_subnet = network_client.subnets.begin_create_or_update(
+                resource_name_vnet,
+                vnet_name,
+                subnet_name,
+                subnet
+            ).result()
+            print(f"Enabled Microsoft.Storage service endpoint for subnet: {subnet_name}")
         except Exception as e:
             raise(e)
-        print(subnet_name[0])
     # Parameters for deployment
     parameters = {
         "IP Addresses Permitted to Remote into Server VM in CIDR Notation": ipAddress,
@@ -59,20 +75,21 @@ def main(tenant_id_arg, client_id_arg, client_secret_arg, subscription_id_arg, u
             "Deploy to New or Existing Virtual Network": "existing",
             "Name of Virtual Network Where MATLAB Web App Server Will Be Deployed": vnet_name,
             "Virtual Network CIDR Range": vnet_cidr,
-            "Name of Subnet for MATLAB Web App Server": subnet_name[0],
+            "Name of Subnet for MATLAB Web App Server": subnet_name,
             "Server Subnet CIDR Range": subnets_cidr[0],
             "Specify Private IP Address to VM Hosting MATLAB Web App Server": '10.1.0.4',
             "Resource Group Name Of Virtual Network": resource_name_vnet,
             "Operating System": platform_arg
         })
 
-    print(parameters)
-
     # Find latest MATLAB release from Github page and get template json path.
     res = requests.get(
         f"https://github.com/mathworks-ref-arch/{ref_arch_name}/tree/main/releases/"
     )
-    latest_releases = [re.findall("releases/(R\d{4}[ab]\\b)", res.text)[-1], re.findall("releases/(R\d{4}[ab]\\b)", res.text)[-2]]
+    latest_releases = [
+        re.findall(r"releases/(R\d{4}[ab]\b)", res.text)[-1],
+        re.findall(r"releases/(R\d{4}[ab]\b)", res.text)[-2]
+    ]
     for i in range(2):
         matlab_release = latest_releases[i]
         print("Testing Health Check Release: " + matlab_release + "\n")
@@ -102,15 +119,17 @@ def main(tenant_id_arg, client_id_arg, client_secret_arg, subscription_id_arg, u
                 print("Deleted the deployment which is deployed using existing virtual network:-",ct)
                 # Wait for above deployment deletion
                 time.sleep(900)
-                # Delete deployment with virtual network
-                DeployOp.delete_resourcegroup(credentials, subscription_id, resource_name_vnet)
-                ct = datetime.datetime.now()
-                print("Deleted the deployment which contains the virtual network:-",ct)
              else:
                 # Delete the deployment
                 deployment_deletion = DeployOp.delete_resourcegroup(credentials, subscription_id, resource_group_name)
                 ct = datetime.datetime.now()
                 print("Date time after deployment and deletion of stack:-", ct)
 
+    if existingVPC=='true':
+        # Delete deployment with virtual network
+        DeployOp.delete_resourcegroup(credentials, subscription_id, resource_name_vnet)
+        ct = datetime.datetime.now()
+        print("Deleted the deployment which contains the virtual network:-", ct)
+
 if __name__ == '__main__':
-    main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7], sys.argv[8], sys.argv[9], sys.argv[10], sys.argv[11], sys.argv[12])
+    main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7], sys.argv[8], sys.argv[9], sys.argv[10], sys.argv[11])
diff --git a/healthcheck/requirements.txt b/healthcheck/requirements.txt
@@ -1,8 +1,9 @@
-azure-functions
-azure-mgmt-resource==8.0.1
-azure-mgmt-marketplaceordering==0.1.0
-azure-mgmt-compute==4.6.2
-azure-mgmt-network==10.2.0
-azure-common==1.1.24
-adal==1.2.2
-msrestazure==0.6.2
+azure-functions==1.23.0
+azure-identity==1.23.0
+azure-mgmt-resource==24.0.0
+azure-mgmt-marketplaceordering==1.1.0
+azure-mgmt-compute==34.1.0
+azure-mgmt-network==29.0.0
+azure-common==1.1.28
+adal==1.2.7
+msrestazure==0.6.4
diff --git a/healthcheck/testtools/AzureAuthentication.py b/healthcheck/testtools/AzureAuthentication.py
@@ -1,6 +1,6 @@
 from azure.common import credentials
 from azure.common.credentials import ServicePrincipalCredentials
-from msrestazure.azure_active_directory import AADTokenCredentials
+from azure.identity import ClientSecretCredential
 import adal
 
 def authenticate_client_key(tenant_id, client_id, client_secret):
@@ -14,6 +14,6 @@ def authenticate_client_key(tenant_id, client_id, client_secret):
 
     context = adal.AuthenticationContext(authority_uri, api_version=None)
     mgmt_token = context.acquire_token_with_client_credentials(resource_uri, client_id, client_secret)
-    credentials = AADTokenCredentials(mgmt_token, client_id)
+    credentials = ClientSecretCredential(tenant_id, client_id, client_secret)
 
     return credentials
diff --git a/healthcheck/testtools/deploy.py b/healthcheck/testtools/deploy.py
@@ -1,5 +1,6 @@
 import urllib.request, json
 import azure.functions as func
+import uuid
 
 from azure.mgmt.resource.resources.models import DeploymentMode
 from azure.mgmt.compute import ComputeManagementClient
@@ -42,10 +43,12 @@ def deploy_webapp_template(credentials,
     print("Beginning the deployment... \n\n")
     # Deploy template.
 
-    deployment = resource_client.deployments.create_or_update(
+    deployment = resource_client.deployments.begin_create_or_update(
         resource_group_name,
         f'{ref_arch_name}-deployment',
-        deployment_properties
+        {
+            "properties": deployment_properties
+        }
     )
 
     # Block because of VM quotas.
@@ -66,7 +69,7 @@ def create_vnet(credentials,
     vnet_cidr):
 
     resource_client = getResourceClient.get_resource_client(credentials, subscription_id)
-    vnet_name = 'my_vnet'
+    vnet_name = "my_vnet-" + str(uuid.uuid4())
 
     # Create resource group
     print("Creating a resource group with a virtual network... \n")
@@ -79,20 +82,19 @@ def create_vnet(credentials,
     print("Resource group created...\n")
 
     # Create virtual network
-    async_vnet_creation = network_client.virtual_networks.create_or_update(
-          resource_name_vnet,
-          vnet_name,
-          {
+    async_vnet_creation = network_client.virtual_networks.begin_create_or_update(
+        resource_group_name=resource_name_vnet,
+        virtual_network_name=vnet_name,
+        parameters={
+            'location': location,
             'address_space': {
                 'address_prefixes': [vnet_cidr]
-          },
-          'location': location
-
+            }
         }
     )
 
-    # Wait for the virtual network creation
-    async_vnet_creation.wait()
+    # Wait for the virtual network creation to complete
+    async_vnet_creation.result()
 
     print("Added a virtual network... \n")
 
@@ -102,13 +104,15 @@ def create_vnet(credentials,
     for i in range(1, len(subnets_cidr) + 1):
 
          # Create Subnet
-         subnet_name = "subnet" + str(i)
-         async_subnet_creation = network_client.subnets.create_or_update(
-                                               resource_name_vnet,
-                                               vnet_name,
-                                               subnet_name,
-                                               {'address_prefix': subnets_cidr[i-1]}
-                                               )
+         subnet_name = "subnet_" + str(i) + "-" + str(uuid.uuid4())
+         async_subnet_creation = network_client.subnets.begin_create_or_update(
+             resource_group_name=resource_name_vnet,
+             virtual_network_name=vnet_name,
+             subnet_name=subnet_name,
+             subnet_parameters={
+                 'address_prefix': subnets_cidr[i - 1]
+             }
+         )
          subnet_info = async_subnet_creation.result()
          # Add created subnet name to subnet_names array
          subnet_names.append(subnet_info.name)
@@ -120,6 +124,6 @@ def create_vnet(credentials,
 def delete_resourcegroup(credentials, subscription_id, resource_group_name) :
     resource_client = getResourceClient.get_resource_client(credentials, subscription_id)
     print("Deleting the deployment... \n\n")
-    deployment_deletion = resource_client.resource_groups.delete(resource_group_name)
+    deployment_deletion = resource_client.resource_groups.begin_delete(resource_group_name)
     print(deployment_deletion)
-    #return deployment_deletion
+    #return deployment_deletion
