unused aws instace and vpcs cleanup

Signed-off-by: shiva kumar <[email protected]>

Author: shivakunv

.github/workflows/awscleanup.yaml

@@ -41,10 +41,10 @@ jobs:
           echo "Found instances: $running_instances"
           echo "instances=$running_instances" >> $GITHUB_ENV
 
-          # Find unused VPCs
+          # Find vpcs with names ci* running longer than 4 hours
           vpcs=$(aws ec2 describe-vpcs \
             --filters Name=tag:Name,Values=ci* \
-            --query "Vpcs[?IsDefault==\`false\` && CreationTimestamp<=\`$(date -u -d '4 hours ago' +%Y-%m-%dT%H:%M:%SZ)\`].VpcId" \
+            --query "Vpcs[?Tags[?Key=='Name' && Value==`ci*`] && Tags[?Key=='CreationTime' && Value<=`$(date -u -d '4 hours ago' +%Y-%m-%dT%H:%M:%SZ)`]].VpcId" \
             --output text | tr -d '\r' | tr '\n' ' ')
 
           echo "Found VPCs: $vpcs"