"No json input available to Data Pull" bug fix (#8)

* "No json input available to Data Pull" bug fix * fixed the script * fixed the script
homeaway · Jun 26, 2019 · a6b8476 · a6b8476
1 parent ca45bd0
commit a6b8476
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,3 +3,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
+
+
+## [0.0.1] - 2019-06-26
+### Fixed
+- Fixed "No json input available to Data Pull" exception when running DataPull from EMR 
+- Fixed create_user_and_roles.sh script
diff --git a/api/src/main/resources/terraform/datapull_iam/create_user_and_roles.sh b/api/src/main/resources/terraform/datapull_iam/create_user_and_roles.sh
@@ -9,9 +9,9 @@ export AWS_DEFAULT_REGION=$3
 echo "creating EMR default roles ===> "
 docker run -e AWS_ACCESS_KEY_ID=$1 -e AWS_SECRET_ACCESS_KEY=$2 -e AWS_DEFAULT_REGION=$3 garland/aws-cli-docker aws emr create-default-roles 
 echo "Initializing Terraform ===>"
-docker run --rm -v $(pwd):/workdir -w /workdir -e AWS_ACCESS_KEY_ID=$1 -e AWS_SECRET_ACCESS_KEY=$2 -e AWS_DEFAULT_REGION=$3 -e TF_VAR_datapull_s3_bucket=$4 -e TF_VAR_docker_image_name=$5 TF_VAR_ui_docker_image_name=$6 hashicorp/terraform:0.11.10 init -backend-config "bucket=$4" \
+docker run --rm -v $(pwd):/workdir -w /workdir -e AWS_ACCESS_KEY_ID=$1 -e AWS_SECRET_ACCESS_KEY=$2 -e AWS_DEFAULT_REGION=$3 -e TF_VAR_datapull_s3_bucket=$4 -e TF_VAR_docker_image_name=$5 -e TF_VAR_ui_docker_image_name=$6 hashicorp/terraform:0.11.10 init -backend-config "bucket=$4" \
      -backend-config "region=$3"
 echo "creating plan ===>"
-docker run --rm  -v $(pwd):/workdir -w /workdir -e AWS_ACCESS_KEY_ID=$1 -e AWS_SECRET_ACCESS_KEY=$2 -e AWS_DEFAULT_REGION=$3 -e TF_VAR_datapull_s3_bucket=$4 -e TF_VAR_docker_image_name=$5 TF_VAR_ui_docker_image_name=$6 hashicorp/terraform:0.11.10 plan -out the_plan.tfplan
+docker run --rm  -v $(pwd):/workdir -w /workdir -e AWS_ACCESS_KEY_ID=$1 -e AWS_SECRET_ACCESS_KEY=$2 -e AWS_DEFAULT_REGION=$3 -e TF_VAR_datapull_s3_bucket=$4 -e TF_VAR_docker_image_name=$5 -e TF_VAR_ui_docker_image_name=$6 hashicorp/terraform:0.11.10 plan -out the_plan.tfplan
 echo "applying plan ===> "
-docker run --rm -v $(pwd):/workdir -w /workdir -e AWS_ACCESS_KEY_ID=$1 -e AWS_SECRET_ACCESS_KEY=$2 -e AWS_DEFAULT_REGION=$3 -e TF_VAR_datapull_s3_bucket=$4 -e TF_VAR_docker_image_name=$5  TF_VAR_ui_docker_image_name=$6 hashicorp/terraform:0.11.10 apply the_plan.tfplan
+docker run --rm -v $(pwd):/workdir -w /workdir -e AWS_ACCESS_KEY_ID=$1 -e AWS_SECRET_ACCESS_KEY=$2 -e AWS_DEFAULT_REGION=$3 -e TF_VAR_datapull_s3_bucket=$4 -e TF_VAR_docker_image_name=$5  -e TF_VAR_ui_docker_image_name=$6 hashicorp/terraform:0.11.10 apply the_plan.tfplan
diff --git a/core/src/main/scala/core/DataPull.scala b/core/src/main/scala/core/DataPull.scala
@@ -69,6 +69,7 @@ object DataPull {
       val dp: String = DataPull.getFile(args(0), false)
       jsonString = dp
     } else {
+      jsonString = args(0)
       isLocal = false
     }