From 48c028b24c8972f8e0afa54fa8e13ca71e721fb5 Mon Sep 17 00:00:00 2001
From: Timothy Middelkoop <tmiddelkoop@internet2.edu>
Date: Thu, 3 Feb 2022 16:35:52 -0600
Subject: [PATCH] GCP: Scripts  to run jupyterlab in cloudshell

---
 Build.md                              | 25 +++++++++++++++++++------
 scripts/gcp-cloudshell-jupyter-lab.sh |  4 ++++
 scripts/gcp-cloudshell.sh             |  4 ++++
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100755 scripts/gcp-cloudshell-jupyter-lab.sh
 create mode 100755 scripts/gcp-cloudshell.sh

diff --git a/Build.md b/Build.md
index c4033d1..2a88a6d 100644
--- a/Build.md
+++ b/Build.md
@@ -32,14 +32,27 @@ This copies the contents of `content/_build/html/` to `docs/` so GitHub Pages wi
 
 ## GCP
 
-Using Jupyter launched from a remote Visual Code Studio session inside GCP Cloud-Shell requires some local settings stored in `local.sh`, use the following as a template replacing the project and email with the proper vaules:
-```
-gcloud config set account student31@class.internet2.edu
-export GOOGLE_CLOUD_PROJECT=just-armor-301114
-export DEVSHELL_PROJECT_ID=$GOOGLE_CLOUD_PROJECT
-gcloud config set project $GOOGLE_CLOUD_PROJECT
+Checkout the project so it is not seen by the students.  Run `./scripts/gcp-cloudshell.sh` to open the shell with the agent and ports 8080 and 8081 forwarded and run the following commands (onetime setup).  Be sure to check the project and account values.
+
+```bash
+git clone git@github.internet2.edu:/CLASS/CLASS-Essentials.git .essentials
+cd .essentials/
+git checkout -b gcp-dev --track origin/gcp-dev
+
+ACCOUNT=learner@class.internet2.edu
+PROJECT=essentials-learner
+cat > .essentials/local.sh <<EOF
+gcloud config set account $ACCOUNT
+export GOOGLE_CLOUD_PROJECT=$PROJECT
+export DEVSHELL_PROJECT_ID=$PROJECT
+gcloud config set project $PROJECT
+EOF
 ```
 
+Then run the following from your local machine (Make sure to shutdown from the web-gui as ctrl-c is not managed properly):
+```bash
+./scripts/gcp-cloudshell-jupyter-lab.sh
+```
 ## AWS
 
 Expect that `aws` is installed locally.  A ssh-key named 'learner' is required to access the account.
diff --git a/scripts/gcp-cloudshell-jupyter-lab.sh b/scripts/gcp-cloudshell-jupyter-lab.sh
new file mode 100755
index 0000000..311cd44
--- /dev/null
+++ b/scripts/gcp-cloudshell-jupyter-lab.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+gcloud cloud-shell ssh --authorize-session --ssh-flag=-A --ssh-flag=-L8080:localhost:8080 --ssh-flag=-L8081:localhost:8081 \
+    --command="cd .essentials && ./scripts/jupyter-lab.sh"
diff --git a/scripts/gcp-cloudshell.sh b/scripts/gcp-cloudshell.sh
new file mode 100755
index 0000000..4f071a6
--- /dev/null
+++ b/scripts/gcp-cloudshell.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+gcloud cloud-shell ssh --authorize-session --ssh-flag=-A --ssh-flag=-L8080:localhost:8080 --ssh-flag=-L8081:localhost:8081
+