Merge pull request #272 from FIRST-Tech-Challenge/pr_separate_app_engine

Reduced time for deploying to app engine

Author: cmacfarl

.github/workflows/prod-deploy.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Write Properties
         run: |
           sha=$(git rev-list --tags --max-count=1)
-          echo "{ \"version\" : \"$(git describe --tags $sha)\" }" > server/app.properties
+          echo "{ \"version\" : \"$(git describe --tags $sha)\" }" > server/app_engine/app.properties
 
       - name: Closure Build
         run: ./gradlew compileJavascript
@@ -81,7 +81,7 @@ jobs:
       - name: Write Properties
         run: |
           sha=$(git rev-list --tags --max-count=1)
-          echo "{ \"version\" : \"$(git describe --tags $sha)\" }" > server/app.properties
+          echo "{ \"version\" : \"$(git describe --tags $sha)\" }" > server/app_engine/app.properties
 
       - name: Closure Build
         run: ./gradlew compileJavascript

.github/workflows/terraform.yml

@@ -29,7 +29,7 @@ jobs:
 
     - name: Write Properties
       run: |
-        echo "{ \"version\" : \"$(git rev-parse --short $GITHUB_SHA) \" }" > server/app.properties
+        echo "{ \"version\" : \"$(git rev-parse --short $GITHUB_SHA) \" }" > server/app_engine/app.properties
 
     - name: Closure Build
       run: ./gradlew compileJavascript

.gitignore

@@ -1,7 +1,6 @@
 .index_updated
 __pycache__/
 compiled/*
-env_variables.yaml
 flask_secret_key.txt
 client_secrets.json
 key.json

README.md

@@ -173,7 +173,7 @@ gcloud auth configure-docker
 Do you want to continue (Y/n)?  y
 ```
 
-## Fill in the values in server/env_variables.yaml
+## Fill in the values in server/app_engine/env_variables.yaml
 
 1. Replace `<YOUR-PROJECT-ID>` with the Google Cloud Project ID for your project.
 1. Replace `<YOUR-ORIGIN>` with the base URL that will serve the website.
@@ -185,11 +185,11 @@ Do you want to continue (Y/n)?  y
 The following command will set the version of fmltc displayed to the user to the current git commit hash.
 
 ```
-echo "{ \"version\": \"$(git rev-parse --short HEAD)\" }" > server/app.properties
+echo "{ \"version\": \"$(git rev-parse --short HEAD)\" }" > server/app_engine/app.properties
 ```
 If you wish the version to be set to something other than the current git commit hash you can use the following code replacing `<VERSION_NAME>` with the desired name of your version
 ```
-echo "{ \"version\": \"<VERSION_NAME>\" }" > server/app.properties
+echo "{ \"version\": \"<VERSION_NAME>\" }" > server/app_engine/app.properties
 ```
 
 ## Setup the environment.
@@ -209,7 +209,7 @@ source env_setup.sh
     scripts/deploy_indexes.sh
     ```
 
-1. Deploy the static content (the CSS styles and the favicon).
+1. Deploy the static content.
     ```
     source env_setup.sh
     scripts/deploy_static.sh

scripts/deploy_cloud_function.sh

@@ -6,8 +6,9 @@ fi
 
 pushd server
 gcloud functions deploy perform_action \
+    --ignore-file=.cloud_function_ignore \
     --runtime=python39 \
-    --set-env-vars PROJECT_ID=${FMLTC_GCLOUD_PROJECT_ID} \
+    --set-env-vars=PROJECT_ID=${FMLTC_GCLOUD_PROJECT_ID} \
     --memory=8192MB \
     --timeout=540 \
     --trigger-resource=${FMLTC_GCLOUD_PROJECT_ID}-action-parameters \

scripts/deploy_gae.sh

@@ -4,6 +4,9 @@ if [[ "${FMLTC_GCLOUD_PROJECT_ID}" == "" ]]; then
 fi
 
 
-pushd server
-gcloud -q app deploy --version v1
-popd
+pushd server/app_engine
+gcloud -q app deploy \
+    --ignore-file=.app_engine_ignore \
+    --appyaml=app.yaml \
+    --version v1
+popd

server/.cloud_function_ignore

@@ -0,0 +1,26 @@
+.cloud_function_ignore
+client_secrets.json
+flask_secret_key.txt
+key.json
+teams
+
+__pycache__/
+app_engine/.app_engine_ignore
+app_engine/announcements.py
+app_engine/app.yaml
+app_engine/app_engine.py
+app_engine/config.py
+app_engine/credentialstore.py
+app_engine/dataset_producer.py
+app_engine/dataset_zipper.py
+app_engine/env_variables.yaml
+app_engine/oidc.py
+app_engine/requirements.txt
+app_engine/roles.py
+app_engine/team_info.py
+app_engine/test_routes.py
+app_engine/tracking.py
+app_engine/wrappers.py
+src/
+static/
+templates/

server/.gcloudignore

@@ -10,7 +10,7 @@
 .git
 .gitignore
 .index_updated
-env_variables.yaml
+app_engine/env_variables.yaml
 flask_secret_key.txt
 client_secrets.json
 key.json

server/app_engine/.app_engine_ignore

@@ -0,0 +1,4 @@
+app.yaml
+env_variables.yaml
+
+__pycache__/