fix(custom-file-in-bucket): Custom file names are also support for S3 output.

[sergargar]

Context

Custom file names were not applied to S3 bucket uploads. (flag -F was not applicable to -D/B)

Description

Include custom file names as well when exporting prowler reports to S3.

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

[jfagoagas]

Check comments and inspect the following:

copyToS3() {
  # Prowler will copy each format to its own folder in S3, that is for better handling 
  # and processing by Quicksight or others.

  # Also, check if -F was introduced
  if [ -n "${OUTPUT_FILE_NAME+x}" ]; then
    OUTPUT_PATH="${OUTPUT_FILE_NAME}"
  else
    OUTPUT_PATH="$OUTPUT_DIR/prowler-output-${ACCOUNT_NUM}-${OUTPUT_DATE}"
  fi

  for output_format in "${MODES[@]}";
  do
    case ${output_format} in
      csv)
        s3cp "${OUTPUT_PATH}" "${EXTENSION_CSV}"
      ;;
      html)
        s3cp "${OUTPUT_PATH}" "${EXTENSION_HTML}"
      ;;
      json)
        s3cp "${OUTPUT_PATH}" "${EXTENSION_JSON}"
      ;;
      json-asff)
        s3cp "${OUTPUT_PATH}" "${EXTENSION_ASFF}"
      ;;
      *)
        echo "$OPTRED ERROR!$OPTNORMAL - Invalid output format copying to S3. Use -h for help."
        exit 1
      ;;
    esac
  done
}

s3cp(){
  OUTPUT_PATH="${1}"
  EXTENSION="${2}"
  "${AWSCLI}" ${PROFILE_OPT} s3 cp "${OUTPUT_PATH}.${EXTENSION}" s3://"${OUTPUT_BUCKET}"/${EXTENSION}/ --acl bucket-owner-full-control
}

[sergargar]

Check comments and inspect the following:

copyToS3() {
  # Prowler will copy each format to its own folder in S3, that is for better handling 
  # and processing by Quicksight or others.

  # Also, check if -F was introduced
  if [ -n "${OUTPUT_FILE_NAME+x}" ]; then
    OUTPUT_PATH="${OUTPUT_FILE_NAME}"
  else
    OUTPUT_PATH="$OUTPUT_DIR/prowler-output-${ACCOUNT_NUM}-${OUTPUT_DATE}"
  fi

  for output_format in "${MODES[@]}";
  do
    case ${output_format} in
      csv)
        s3cp "${OUTPUT_PATH}" "${EXTENSION_CSV}"
      ;;
      html)
        s3cp "${OUTPUT_PATH}" "${EXTENSION_HTML}"
      ;;
      json)
        s3cp "${OUTPUT_PATH}" "${EXTENSION_JSON}"
      ;;
      json-asff)
        s3cp "${OUTPUT_PATH}" "${EXTENSION_ASFF}"
      ;;
      *)
        echo "$OPTRED ERROR!$OPTNORMAL - Invalid output format copying to S3. Use -h for help."
        exit 1
      ;;
    esac
  done
}

s3cp(){
  OUTPUT_PATH="${1}"
  EXTENSION="${2}"
  "${AWSCLI}" ${PROFILE_OPT} s3 cp "${OUTPUT_PATH}.${EXTENSION}" s3://"${OUTPUT_BUCKET}"/${EXTENSION}/ --acl bucket-owner-full-control
}

I love it! Thank you @jfagoagas

[jfagoagas]

Awesome!!!

A really good fix here.