Merge branch 'fix-windows-ec2' into ec2-windows-ssm

Author: XinRanZhAWS

.github/workflows/dotnet-ec2-canary.yml

@@ -10,6 +10,9 @@ on:
   workflow_dispatch: # be able to run the workflow on demand
   schedule:
     - cron: '*/15 * * * *' # run the workflow every 15 minutes
+  push:
+    branches:
+      - "fix-windows-ec2"
 
 permissions:
   id-token: write

.github/workflows/dotnet-sample-app-s3-deploy.yml

@@ -4,6 +4,9 @@
 name: Sample App Deployment - Dotnet S3
 on:
   workflow_dispatch: # be able to run the workflow on demand
+  push:
+    branches:
+      - "fix-windows-ec2"
 
 permissions:
   id-token: write

sample-apps/dotnet/dotnet-ec2-win-main-setup.ps1

@@ -33,6 +33,7 @@ while ($elapsedTime -lt $timeout) {
         Write-Host "Install Finished"
         break
     } else {
+        $call_cloudwatch = & "C:\Program Files\Amazon\AmazonCloudWatchAgent\amazon-cloudwatch-agent-ctl.ps1"
         Write-Host "Cloudwatch Agent not found: $filePath. Checking again in $interval seconds..."
         Start-Sleep -Seconds $interval
         $elapsedTime += $interval

sample-apps/dotnet/dotnet-ec2-win-remote-setup.ps1

@@ -31,6 +31,7 @@ while ($elapsedTime -lt $timeout) {
         Write-Host "Install Finished"
         break
     } else {
+        $call_cloudwatch = & "C:\Program Files\Amazon\AmazonCloudWatchAgent\amazon-cloudwatch-agent-ctl.ps1"
         Write-Host "Cloudwatch Agent not found: $filePath. Checking again in $interval seconds..."
         Start-Sleep -Seconds $interval
         $elapsedTime += $interval