From 9292e9380fe364df9d9505f5cfc256f49c8df887 Mon Sep 17 00:00:00 2001
From: Wencheng Lu <wlu@google.com>
Date: Tue, 21 Mar 2017 16:01:37 -0700
Subject: [PATCH] add -- for gcloud compute ssh

---
 script/gce-grpc-test-server     | 2 +-
 script/linux-gae-instance       | 2 +-
 script/rapture-test-gce-install | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/gce-grpc-test-server b/script/gce-grpc-test-server
index feec547cf..b7c3449d4 100755
--- a/script/gce-grpc-test-server
+++ b/script/gce-grpc-test-server
@@ -79,7 +79,7 @@ echo "Creating a GCE-VM ${INSTANCE}"
 
 function remote() {
   echo "Remotely run command: $*"
-  ${GCLOUD} compute ssh "${INSTANCE}" "${COMMON_ARGS[@]}" --command="$*" \
+  ${GCLOUD} compute ssh "${INSTANCE}" -- "${COMMON_ARGS[@]}" --command="$*" \
     || error_exit "Failed to remotely run command: $*"
 }
 
diff --git a/script/linux-gae-instance b/script/linux-gae-instance
index 343c9cc0c..453967e0d 100755
--- a/script/linux-gae-instance
+++ b/script/linux-gae-instance
@@ -177,7 +177,7 @@ function download_nginx_logs() {
 
   retry -n 2 -s 10 \
     ${GCLOUD} compute ssh --project=${PROJECT} --zone=${vm_zone} ${vm_name} \
-        "sudo tar czf \"${remote_archive}\" /var/log/ ; sudo chmod 777 \"${remote_archive}\"" \
+        "-- sudo tar czf \"${remote_archive}\" /var/log/ ; sudo chmod 777 \"${remote_archive}\"" \
     || error_exit "Cannot tar backend VM logs."
 
   retry -n 2 -s 10 \
diff --git a/script/rapture-test-gce-install b/script/rapture-test-gce-install
index cb9c993ce..55a493e12 100755
--- a/script/rapture-test-gce-install
+++ b/script/rapture-test-gce-install
@@ -108,7 +108,7 @@ echo "Copying the script to VM"
   || error_exit "Failed to copy install script to VM."
 
 echo "Run the script in VM"
-"${GCLOUD}" compute ssh "${INSTANCE}" "${COMMON_ARGS[@]}" \
+"${GCLOUD}" compute ssh "${INSTANCE}" -- "${COMMON_ARGS[@]}" \
     --command=./install.sh \
   || error_exit "Failed to install the package in VM."