diff --git a/.github/workflows/healthcheck-app-existingVnet-Lin-Thurs.yml b/.github/workflows/healthcheck-app-existingVnet-Lin-Thurs.yml index ca4b19e..e248134 100644 --- a/.github/workflows/healthcheck-app-existingVnet-Lin-Thurs.yml +++ b/.github/workflows/healthcheck-app-existingVnet-Lin-Thurs.yml @@ -34,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 index 1dd75b5..d62678a 100644 --- a/.github/workflows/healthcheck-app-existingVnet-Win-Tue.yml +++ b/.github/workflows/healthcheck-app-existingVnet-Win-Tue.yml @@ -34,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 index f5f491e..395a77a 100644 --- a/.github/workflows/healthcheck-app-newVnet-Lin-Wed.yml +++ b/.github/workflows/healthcheck-app-newVnet-Lin-Wed.yml @@ -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 index be89d01..1a4357e 100644 --- a/.github/workflows/healthcheck-app-newVnet-Win-Mon.yml +++ b/.github/workflows/healthcheck-app-newVnet-Win-Mon.yml @@ -35,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 index d7b1ccf..a1d980f 100644 --- a/healthcheck/healthcheck_webapps_refarch.py +++ b/healthcheck/healthcheck_webapps_refarch.py @@ -13,7 +13,7 @@ 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. @@ -26,6 +26,7 @@ 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': # Subnets & virtual network info @@ -131,4 +132,4 @@ def main(tenant_id_arg, client_id_arg, client_secret_arg, subscription_id_arg, u 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])