Fix bug where an instance with a specific id gets retrieved from a gi…

…ven region but propagate an error when we attempt to find it from another region it is not in.

Signed-off-by: Vasil Sirakov <sirakov97@gmail.com>

providers/aws/resources/aws.go

@@ -70,6 +70,16 @@ func Is400AccessDeniedError(err error) bool {
  return false
 }
 
+func Is400InstanceNotFoundError(err error) bool {
+ var respErr *http.ResponseError
+ if errors.As(err, &respErr) {
+ if respErr.HTTPStatusCode() == 400 && (strings.Contains(respErr.Error(), "InvalidInstanceID.NotFound") || strings.Contains(respErr.Error(), "InvalidInstanceID.Malformed")) {
+ return true
+ }
+ }
+ return false
+}
+
 func strMapToInterface(m map[string]string) map[string]interface{} {
  res := map[string]interface{}{}
  for k, v := range m {

providers/aws/resources/aws_ec2.go

@@ -817,6 +817,13 @@ func (a *mqlAwsEc2) getInstances(conn *connection.AwsConnection) []*jobpool.Job
  log.Warn().Str("region", regionVal).Msg("error accessing region for AWS API")
  return res, nil
  }
+ // AWS returns an error response when trying to find an instance with a specific identifier if it cannot find it in some region.
+ // we do not propagate this error upward because an instance can be found in one region and return an error for all others which
+ // would be the expected behavior.
+ if Is400InstanceNotFoundError(err) {
+ log.Debug().Str("region", regionVal).Msg("could not find instance in region")
+ return res, nil
+ }
  return nil, err
  }
  res, err = a.gatherInstanceInfo(instances, regionVal)