Always enable websocket transport (#232)

Author: pantherman594

startupscript/butane/006-start-proxy-agent.sh

@@ -41,11 +41,6 @@ readonly TERRA_SERVER
 if [[ "${TERRA_SERVER}" == "dev-stable" ]]; then
     OPTIONS+=("--debug=true")
 fi
-PROXY_WS_TUNNEL="$(get_metadata_value "proxy-websocket-tunnel-enabled" "")"
-if [[ "${PROXY_WS_TUNNEL}" == "TRUE" ]]; then
-    OPTIONS+=("--websocket-transport=true")
-fi
-readonly PROXY_WS_TUNNEL
 readonly OPTIONS
 
 # Pull the latest proxy agent
@@ -67,4 +62,5 @@ docker run \
   --shim-path="${SHIM_PATH}" \
   --rewrite-websocket-host="${REWRITE_WEBSOCKET_HOST}" \
   --enable-monitoring-script="${ENABLE_MONITORING_SCRIPT:-false}" \
+  --websocket-transport=true \
   "${OPTIONS[@]}"

startupscript/dataproc/startup.sh

@@ -871,14 +871,6 @@ if [[ "${PROXY_TYPE}" != "${PROXY_TYPE_GOOGLE}" ]]; then
       ENABLE_MONITORING_SCRIPT="$(get_metadata_value "instance/attributes/enable-dataproc-monitoring-script")"
       readonly ENABLE_MONITORING_SCRIPT
 
-      OPTIONS=()
-      PROXY_WS_TUNNEL="$(get_metadata_value "instance/attributes/proxy-websocket-tunnel-enabled" "")"
-      if [[ "${PROXY_WS_TUNNEL}" == "TRUE" ]]; then
-          OPTIONS+=("--websocket-transport=true")
-      fi
-      readonly PROXY_WS_TUNNEL
-      readonly OPTIONS
-
       readonly WORKSPACE_LINK_EL='<a id="workspace" class="forum" target="_blank" href="'"${UI_BASE_URL}/workspaces/${TERRA_WORKSPACE}"'"'">${TERRA_WORKSPACE}</a>"
 
       # Define Workbench Proxy Agent startup script
@@ -937,7 +929,7 @@ docker run \
   --session-cookie-name="_xsrf" \
   --inject-banner="\$(cat ${PROXY_AGENT_BANNER})" \
   --enable-monitoring-script="${ENABLE_MONITORING_SCRIPT:-false}" \
-  ${OPTIONS[@]}
+  --websocket-transport=true
 EOF
       # Grant execute permission to the startup script
       chmod +x "${WORKBENCH_PROXY_AGENT_STARTUP_SCRIPT}"