Simplify env variables to be the same for both local and GCS paths. (#…

…285)

build/simple/run.sh

@@ -13,13 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if [[ $GCS_OUTPUT_DIR != "" ]]; then
-    export OUTPUT_DIR=$GCS_OUTPUT_DIR
-else
+if [ "$OUTPUT_DIR" = "" ]; then
     export OUTPUT_DIR=/output/
 fi
 
-if [[ $CONFIG_FILE != "" ]]; then
+if [ "$CONFIG_FILE" != "" ]; then
     echo "DC_API_KEY=$DC_API_KEY"
     echo "CONFIG_FILE=$CONFIG_FILE"
     echo "OUTPUT_DIR=$OUTPUT_DIR"
@@ -29,9 +27,7 @@ if [[ $CONFIG_FILE != "" ]]; then
         --config_file=$CONFIG_FILE \
         --output_dir=$OUTPUT_DIR
 else
-    if [[ $GCS_INPUT_DIR != "" ]]; then
-        export INPUT_DIR=$GCS_INPUT_DIR
-    else
+    if [ "$INPUT_DIR" = "" ]; then
         export INPUT_DIR=/input/
     fi
 
@@ -44,4 +40,3 @@ else
         --input_dir=$INPUT_DIR \
         --output_dir=$OUTPUT_DIR
 fi
-

tools/simple/README.md

@@ -7,6 +7,6 @@ can be run locally.
 * If using GCS:
   * Run `gcloud beta auth application-default login`.
   * Specify your cloud project via the `GOOGLE_CLOUD_PROJECT` variable.
-* If using config file and output dirs, specify `CONFIG_FILE` and `GCS_OUTPUT_DIR` (or `OUTPUT_DIR`) respectively.
-* If using local input and output dirs, specify `INPUT_DIR` and `OUTPUT_DIR` respectively.
-* If using GCS input and output dirs, specify `GCS_INPUT_DIR` and `GCS_OUTPUT_DIR` respectively.
+* If using config file and output dir, specify `CONFIG_FILE` and `OUTPUT_DIR` respectively.
+* If using input dir and output dir, specify `INPUT_DIR` and `OUTPUT_DIR` respectively.
+* Note that `CONFIG_FILE`, `INPUT_DIR` and `OUTPUT_DIR` can be GCS paths or local file system paths.

tools/simple/env.list

@@ -1,7 +1,5 @@
 DC_API_KEY=
+CONFIG_FILE=
 INPUT_DIR=
 OUTPUT_DIR=
-GCS_INPUT_DIR=
-GCS_OUTPUT_DIR=
-CONFIG_FILE=
 GOOGLE_CLOUD_PROJECT=

tools/simple/run_simple.sh

@@ -17,18 +17,23 @@ set -o allexport
 source env.list
 set +o allexport
 
-if [[ $CONFIG_FILE != "" ]]; then
-    docker run -it \
-        --env-file env.list \
-        -e GOOGLE_APPLICATION_CREDENTIALS=/gcp/creds.json \
-        -v $HOME/.config/gcloud/application_default_credentials.json:/gcp/creds.json:ro \
-        -e CONFIG_FILE=/config.json \
-        -v $CONFIG_FILE:/config.json:ro \
-        gcr.io/datcom-ci/datacommons-simple:latest
-else
-    docker run -it \
-        --env-file env.list \
-        -e GOOGLE_APPLICATION_CREDENTIALS=/gcp/creds.json \
-        -v $HOME/.config/gcloud/application_default_credentials.json:/gcp/creds.json:ro \
-        gcr.io/datcom-ci/datacommons-simple:latest
+ARGS=""
+
+if [ "$CONFIG_FILE" != "" && "$CONFIG_FILE" != "gs://"* ]; then
+    ARGS+="-e CONFIG_FILE=/config.json -v $CONFIG_FILE:/config.json "
+fi
+
+if [[ "$INPUT_DIR" != "" && "$INPUT_DIR" != "gs://"* ]]; then
+    ARGS+="-e INPUT_DIR=/input -v $INPUT_DIR:/input "
 fi
+
+if [[ "$OUTPUT_DIR" != "" && "$OUTPUT_DIR" != "gs://"* ]]; then
+    ARGS+="-e OUTPUT_DIR=/output -v $OUTPUT_DIR:/output "
+fi
+
+docker run -it \
+    --env-file env.list \
+    -e GOOGLE_APPLICATION_CREDENTIALS=/gcp/creds.json \
+    -v $HOME/.config/gcloud/application_default_credentials.json:/gcp/creds.json:ro \
+    $ARGS \
+    gcr.io/datcom-ci/datacommons-simple:latest