Add eshop UI tests on AWS

.github/scripts/delete-aws-resources.sh

@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# ------------------------------------------------------------
+# Copyright 2023 The Radius Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#    
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------
+
+
+APP_NAME=$1
+APP_LABEL='RadiusApplication'
+RESOURCE_TYPES='AWS::RDS::DBInstance,AWS::RDS::DBSubnetGroup,AWS::MemoryDB::Cluster,AWS::MemoryDB::SubnetGroup'
+
+# File to store the list of deleted resources
+DELETED_RESOURCES_FILE='deleted-resources.txt'
+
+# Number of retries
+MAX_RETRIES=5
+
+# Retry delay in seconds
+RETRY_DELAY=300 # 5 minutes
+
+function delete_aws_resources() {
+  # Empty the file
+  truncate -s 0 $DELETED_RESOURCES_FILE
+
+  for resource_type in ${RESOURCE_TYPES//,/ }
+  do
+    aws cloudcontrol list-resources --type-name "$resource_type" --query "ResourceDescriptions[].Identifier" --output text | tr '\t' '\n' | while read identifier
+    do
+      aws cloudcontrol get-resource --type-name "$resource_type" --identifier "$identifier" --query "ResourceDescription.Properties" --output text | while read resource
+      do
+        resource_tags=$(jq -c -r .Tags <<< "$resource")
+        for tag in $(jq -c -r '.[]' <<< "$resource_tags")
+        do
+          key=$(jq -r '.Key' <<< "$tag")
+          value=$(jq -r '.Value' <<< "$tag")
+          if [[ "$key" == "$APP_LABEL" && "$value" == "$APP_NAME" ]]
+          then
+            echo "Deleting resource of type: $resource_type with identifier: $identifier"
+            echo "$identifier\n" >> $DELETED_RESOURCES_FILE
+            aws cloudcontrol delete-resource --type-name "$resource_type" --identifier "$identifier"
+          fi
+        done
+      done
+    done
+  done
+
+  if [ -s $DELETED_RESOURCES_FILE ]; then
+    return 1
+  else
+    return 0
+  fi
+}
+
+RETRY_COUNT=0
+while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
+    # Trigger the function to delete the resources
+    delete_aws_resources
+
+    # If the function returned 0, then no resources needed to be deleted
+    # on this run. This means that all resources have been deleted.
+    if [ $? -eq 0 ]; then
+        echo "All resources deleted successfully"
+        break
+    fi
+
+    # Still have resources to delete, increase the retry count
+    RETRY_COUNT=$((RETRY_COUNT + 1))
+
+    # Check if there are more retries left
+    if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
+        # Retry after delay
+        echo "Retrying in $RETRY_DELAY seconds..."
+        sleep $RETRY_DELAY
+    fi
+done
+
+# Check if the maximum number of retries exceeded
+if [ $RETRY_COUNT -eq $MAX_RETRIES ]; then
+    echo "Maximum number of retries exceeded"
+fi

.github/workflows/purge-test-resources.yaml → .github/workflows/purge-azure-test-resources.yaml

@@ -1,4 +1,4 @@
-name: Purge test resources
+name: Purge Azure test resources
 on:
   schedule:
     - cron: "30 0,12 * * *"
@@ -7,7 +7,7 @@ env:
   VALID_RESOURCE_WINDOW: 6*60*60
 jobs:
   purge_azure_resources:
-    name: Azure resources clean-ups
+    name: Azure test resource cleanup
     runs-on: [self-hosted, 1ES.Pool=1ES-Radius]
     steps:
       - name: Login to Azure
@@ -18,30 +18,47 @@ jobs:
             --tenant ${{ secrets.AZURE_SP_TESTS_TENANTID }}
 
           az account set --subscription ${{ secrets.AZURE_SUBSCRIPTIONID_TESTS }}
-
       - name: List Test Resource Groups
         run: |
           echo "## Test resource group list" >> $GITHUB_STEP_SUMMARY
-          az group list --query "[?starts_with(name, 'samplestest-')].{Name:name, creationTime:tags.creationTime}" -o json > resource_groups.json
+
+          # Create the file to store the resource group list
+          touch ${{ env.AZURE_RG_DELETE_LIST_FILE}}
+
+          resource_groups=$(az group list --query "[].{Name:name, creationTime:tags.creationTime}" -o tsv)
 
           current_time=$(date +%s)
           hours_ago=$((current_time - ${{ env.VALID_RESOURCE_WINDOW }}))
+          while IFS=$'\t' read -r name creation_time; do
+            if [[ ! "$name" =~ ^"samplestest-" ]]; then
+              continue
+            fi
 
-          jq -r '.[] | select(.creationTime == null || .creationTime < '$hours_ago') | .Name' resource_groups.json > ${{ env.AZURE_RG_DELETE_LIST_FILE}}
-          jq -r '.[] | {name: .Name, creationTime: .creationTime // "None"}' resource_groups.json > $GITHUB_STEP_SUMMARY
+            if [ "$creation_time" = "None" ]; then
+              echo " * :wastebasket: $name - old resource"  >> $GITHUB_STEP_SUMMARY
+              echo $name >> ${{ env.AZURE_RG_DELETE_LIST_FILE}}
+              continue
+            fi
 
+            # Check if the resource group was created more than 6 hours ago
+            if [ "$creation_time" -lt "$hours_ago" ]; then
+              echo " * :wastebasket: $name - creationTime: $creation_time"  >> $GITHUB_STEP_SUMMARY
+              echo $name >> ${{ env.AZURE_RG_DELETE_LIST_FILE}}
+            else
+              echo " * :white_check_mark: $name - creationTime: $creation_time"  >> $GITHUB_STEP_SUMMARY
+            fi
+          done <<< "$resource_groups"
       - name: Delete Azure Resource Groups
         run: |
           echo "## Deleting resource group list" >> $GITHUB_STEP_SUMMARY
-          cat ${{ env.AZURE_RG_DELETE_LIST_FILE}} | while read -r line
+          cat ${{ env.AZURE_RG_DELETE_LIST_FILE}} | while read line
           do
               echo " * $line" >> $GITHUB_STEP_SUMMARY
               az group delete --resource-group $line --yes --verbose
           done
-
       - name: Create GitHub issue on failure
         if: ${{ failure() }}
         run: |
-          gh issue create --title "Samples purge test resources failed \
+          gh issue create --title "Samples purge Azure test resources failed" \
             --body "Test failed on ${{ github.repository }}. See [workflow logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for more details." \
-            s--repo ${{ github.repository }}
+            --repo ${{ github.repository }}

.github/workflows/release.yaml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Radius version number to use (e.g. 0.22.0, 0.23.0-rc1)'
+        description: 'Radius version number to use (e.g. 0.1.0, 0.1.0-rc1)'
         required: true
         default: ''
         type: string