fix(query): amazon rds db instance publicly accessible query refactor

fix(query): amazon rds db instance publicly accessible query refactor #9748