Fix milo deployment
Appengine doesn't seem to like console.go being in a nested subfolder of
the app.yaml folder.
This:
* Moves the appengine specific files into a new directory, along with templates and static
* fixes the bower_components softlink to point at the right one
* Updates the Makefile
See:
https://stackoverflow.com/questions/26794225/google-go-appengine-imports-and-conflicts-when-serving-testing
BUG=736131
R=iannucci@chromium.org
Review-Url: https://codereview.chromium.org/2953183002 .
diff --git a/milo/Makefile b/milo/Makefile
index 8ea4bc7..81d612c 100644
--- a/milo/Makefile
+++ b/milo/Makefile
@@ -6,36 +6,36 @@
projdir := $(patsubst %/,%,$(dir $(mkfile_path)))
dev:
- gae.py devserver --app-dir $(projdir)/appengine -- --host 0.0.0.0 --port 8082 --admin_port 7999 --log_level debug
+ gae.py devserver --app-dir $(projdir)/frontend/appengine -- --host 0.0.0.0 --port 8082 --admin_port 7999 --log_level debug
# This is intentionally not dependent on the others below to avoid
# asking for user confirmation multiple times.
up: up-all up-dispatch
up-all:
- gae.py upload -A luci-milo --app-dir $(projdir)/appengine/frontend default pubsub api
+ gae.py upload -A luci-milo --app-dir $(projdir)/frontend/appengine default pubsub api
up-default:
- gae.py upload -A luci-milo --app-dir $(projdir)/appengine/frontend default
+ gae.py upload -A luci-milo --app-dir $(projdir)/frontend/appengine default
up-pubsub:
- gae.py upload -A luci-milo --app-dir $(projdir)/appengine/frontend pubsub
+ gae.py upload -A luci-milo --app-dir $(projdir)/frontend/appengine pubsub
up-api:
- gae.py upload -A luci-milo --app-dir $(projdir)/appengine/frontend api
+ gae.py upload -A luci-milo --app-dir $(projdir)/frontend/appengine api
up-dispatch:
- appcfg.py -A luci-milo update_dispatch $(projdir)/appengine/frontend
+ appcfg.py -A luci-milo update_dispatch $(projdir)/frontend/appengine
up-dev: up-dev-logs
- gae.py upload -A luci-milo-dev --app-dir $(projdir)/appengine default pubsub api
- appcfg.py -A luci-milo-dev update_dispatch $(projdir)/appengine/frontend
+ gae.py upload -A luci-milo-dev --app-dir $(projdir)/frontend/appengine default pubsub api
+ appcfg.py -A luci-milo-dev update_dispatch $(projdir)/frontend/appengine
up-dev-default:
- gae.py upload -A luci-milo-dev --app-dir $(projdir)/appengine/frontend default
+ gae.py upload -A luci-milo-dev --app-dir $(projdir)/frontend/appengine default
up-dev-logs:
- gcloud app deploy --project luci-milo-dev --version dev $(projdir)/appengine/logs/module-logs.yaml
+ gcloud app deploy --project luci-milo-dev --version dev $(projdir)/logs/module-logs.yaml
test:
go test ./...
diff --git a/milo/frontend/app.yaml b/milo/frontend/appengine/app.yaml
similarity index 96%
rename from milo/frontend/app.yaml
rename to milo/frontend/appengine/app.yaml
index 600b895..8095555 100644
--- a/milo/frontend/app.yaml
+++ b/milo/frontend/appengine/app.yaml
@@ -37,7 +37,7 @@
- remote_api: on
includes:
-- static
+- ./static/include.yaml
inbound_services:
- warmup
diff --git a/milo/frontend/cron.yaml b/milo/frontend/appengine/cron.yaml
similarity index 100%
rename from milo/frontend/cron.yaml
rename to milo/frontend/appengine/cron.yaml
diff --git a/milo/frontend/dispatch.yaml b/milo/frontend/appengine/dispatch.yaml
similarity index 100%
rename from milo/frontend/dispatch.yaml
rename to milo/frontend/appengine/dispatch.yaml
diff --git a/milo/frontend/index.yaml b/milo/frontend/appengine/index.yaml
similarity index 100%
rename from milo/frontend/index.yaml
rename to milo/frontend/appengine/index.yaml
diff --git a/milo/frontend/appengine/main.go b/milo/frontend/appengine/main.go
new file mode 100644
index 0000000..3d1164f
--- /dev/null
+++ b/milo/frontend/appengine/main.go
@@ -0,0 +1,11 @@
+// Copyright 2017 The LUCI Authors. All rights reserved.
+// Use of this source code is governed under the Apache License, Version 2.0
+// that can be found in the LICENSE file.
+
+package appengine
+
+import "github.com/luci/luci-go/milo/frontend"
+
+func init() {
+ frontend.Run()
+}
diff --git a/milo/frontend/module-api.yaml b/milo/frontend/appengine/module-api.yaml
similarity index 100%
rename from milo/frontend/module-api.yaml
rename to milo/frontend/appengine/module-api.yaml
diff --git a/milo/frontend/module-pubsub.yaml b/milo/frontend/appengine/module-pubsub.yaml
similarity index 100%
rename from milo/frontend/module-pubsub.yaml
rename to milo/frontend/appengine/module-pubsub.yaml
diff --git a/milo/frontend/static/bootstrap/third_party/css/bootstrap-theme.min.css b/milo/frontend/appengine/static/bootstrap/third_party/css/bootstrap-theme.min.css
similarity index 100%
rename from milo/frontend/static/bootstrap/third_party/css/bootstrap-theme.min.css
rename to milo/frontend/appengine/static/bootstrap/third_party/css/bootstrap-theme.min.css
diff --git a/milo/frontend/static/bootstrap/third_party/css/bootstrap.min.css b/milo/frontend/appengine/static/bootstrap/third_party/css/bootstrap.min.css
similarity index 100%
rename from milo/frontend/static/bootstrap/third_party/css/bootstrap.min.css
rename to milo/frontend/appengine/static/bootstrap/third_party/css/bootstrap.min.css
diff --git a/milo/frontend/static/bootstrap/third_party/js/bootstrap.min.js b/milo/frontend/appengine/static/bootstrap/third_party/js/bootstrap.min.js
similarity index 100%
rename from milo/frontend/static/bootstrap/third_party/js/bootstrap.min.js
rename to milo/frontend/appengine/static/bootstrap/third_party/js/bootstrap.min.js
diff --git a/milo/frontend/static/buildbot/css/default.css b/milo/frontend/appengine/static/buildbot/css/default.css
similarity index 100%
rename from milo/frontend/static/buildbot/css/default.css
rename to milo/frontend/appengine/static/buildbot/css/default.css
diff --git a/milo/frontend/appengine/static/common/auth b/milo/frontend/appengine/static/common/auth
new file mode 120000
index 0000000..368316a
--- /dev/null
+++ b/milo/frontend/appengine/static/common/auth
@@ -0,0 +1 @@
+../../../../../server/static/auth
\ No newline at end of file
diff --git a/milo/frontend/appengine/static/common/bower_components b/milo/frontend/appengine/static/common/bower_components
new file mode 120000
index 0000000..8d99fff
--- /dev/null
+++ b/milo/frontend/appengine/static/common/bower_components
@@ -0,0 +1 @@
+../../../../../server/static/upload/bower_components
\ No newline at end of file
diff --git a/milo/frontend/static/common/favicon/brown-192.png b/milo/frontend/appengine/static/common/favicon/brown-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/brown-192.png
rename to milo/frontend/appengine/static/common/favicon/brown-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/brown-32.png b/milo/frontend/appengine/static/common/favicon/brown-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/brown-32.png
rename to milo/frontend/appengine/static/common/favicon/brown-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/darkpurple-192.png b/milo/frontend/appengine/static/common/favicon/darkpurple-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/darkpurple-192.png
rename to milo/frontend/appengine/static/common/favicon/darkpurple-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/darkpurple-32.png b/milo/frontend/appengine/static/common/favicon/darkpurple-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/darkpurple-32.png
rename to milo/frontend/appengine/static/common/favicon/darkpurple-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/gray-192.png b/milo/frontend/appengine/static/common/favicon/gray-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/gray-192.png
rename to milo/frontend/appengine/static/common/favicon/gray-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/gray-32.png b/milo/frontend/appengine/static/common/favicon/gray-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/gray-32.png
rename to milo/frontend/appengine/static/common/favicon/gray-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/green-192.png b/milo/frontend/appengine/static/common/favicon/green-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/green-192.png
rename to milo/frontend/appengine/static/common/favicon/green-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/green-32.png b/milo/frontend/appengine/static/common/favicon/green-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/green-32.png
rename to milo/frontend/appengine/static/common/favicon/green-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/milo-192.png b/milo/frontend/appengine/static/common/favicon/milo-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/milo-192.png
rename to milo/frontend/appengine/static/common/favicon/milo-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/milo-32.png b/milo/frontend/appengine/static/common/favicon/milo-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/milo-32.png
rename to milo/frontend/appengine/static/common/favicon/milo-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/purple-192.png b/milo/frontend/appengine/static/common/favicon/purple-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/purple-192.png
rename to milo/frontend/appengine/static/common/favicon/purple-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/purple-32.png b/milo/frontend/appengine/static/common/favicon/purple-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/purple-32.png
rename to milo/frontend/appengine/static/common/favicon/purple-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/red-192.png b/milo/frontend/appengine/static/common/favicon/red-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/red-192.png
rename to milo/frontend/appengine/static/common/favicon/red-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/red-32.png b/milo/frontend/appengine/static/common/favicon/red-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/red-32.png
rename to milo/frontend/appengine/static/common/favicon/red-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/redamber-192.png b/milo/frontend/appengine/static/common/favicon/redamber-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/redamber-192.png
rename to milo/frontend/appengine/static/common/favicon/redamber-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/redamber-32.png b/milo/frontend/appengine/static/common/favicon/redamber-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/redamber-32.png
rename to milo/frontend/appengine/static/common/favicon/redamber-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/teal-192.png b/milo/frontend/appengine/static/common/favicon/teal-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/teal-192.png
rename to milo/frontend/appengine/static/common/favicon/teal-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/teal-32.png b/milo/frontend/appengine/static/common/favicon/teal-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/teal-32.png
rename to milo/frontend/appengine/static/common/favicon/teal-32.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/yellow-192.png b/milo/frontend/appengine/static/common/favicon/yellow-192.png
similarity index 100%
rename from milo/frontend/static/common/favicon/yellow-192.png
rename to milo/frontend/appengine/static/common/favicon/yellow-192.png
Binary files differ
diff --git a/milo/frontend/static/common/favicon/yellow-32.png b/milo/frontend/appengine/static/common/favicon/yellow-32.png
similarity index 100%
rename from milo/frontend/static/common/favicon/yellow-32.png
rename to milo/frontend/appengine/static/common/favicon/yellow-32.png
Binary files differ
diff --git a/milo/frontend/static/common/js/time.js b/milo/frontend/appengine/static/common/js/time.js
similarity index 100%
rename from milo/frontend/static/common/js/time.js
rename to milo/frontend/appengine/static/common/js/time.js
diff --git a/milo/frontend/static/common/logos/apple.svg b/milo/frontend/appengine/static/common/logos/apple.svg
similarity index 100%
rename from milo/frontend/static/common/logos/apple.svg
rename to milo/frontend/appengine/static/common/logos/apple.svg
diff --git a/milo/frontend/static/common/logos/ubuntu.svg b/milo/frontend/appengine/static/common/logos/ubuntu.svg
similarity index 100%
rename from milo/frontend/static/common/logos/ubuntu.svg
rename to milo/frontend/appengine/static/common/logos/ubuntu.svg
diff --git a/milo/frontend/static/common/logos/windows.svg b/milo/frontend/appengine/static/common/logos/windows.svg
similarity index 100%
rename from milo/frontend/static/common/logos/windows.svg
rename to milo/frontend/appengine/static/common/logos/windows.svg
diff --git a/milo/frontend/appengine/static/common/rpc b/milo/frontend/appengine/static/common/rpc
new file mode 120000
index 0000000..2ab057a
--- /dev/null
+++ b/milo/frontend/appengine/static/common/rpc
@@ -0,0 +1 @@
+../../../../../server/static/rpc
\ No newline at end of file
diff --git a/milo/frontend/appengine/static/common/rpcexplorer b/milo/frontend/appengine/static/common/rpcexplorer
new file mode 120000
index 0000000..721922f
--- /dev/null
+++ b/milo/frontend/appengine/static/common/rpcexplorer
@@ -0,0 +1 @@
+../../../../../server/static/rpcexplorer
\ No newline at end of file
diff --git a/milo/frontend/static/common/third_party/css/jquery-ui.min.css b/milo/frontend/appengine/static/common/third_party/css/jquery-ui.min.css
similarity index 100%
rename from milo/frontend/static/common/third_party/css/jquery-ui.min.css
rename to milo/frontend/appengine/static/common/third_party/css/jquery-ui.min.css
diff --git a/milo/frontend/static/common/third_party/js/README.chromium b/milo/frontend/appengine/static/common/third_party/js/README.chromium
similarity index 100%
rename from milo/frontend/static/common/third_party/js/README.chromium
rename to milo/frontend/appengine/static/common/third_party/js/README.chromium
diff --git a/milo/frontend/static/common/third_party/js/jquery-ui.min.js b/milo/frontend/appengine/static/common/third_party/js/jquery-ui.min.js
similarity index 100%
rename from milo/frontend/static/common/third_party/js/jquery-ui.min.js
rename to milo/frontend/appengine/static/common/third_party/js/jquery-ui.min.js
diff --git a/milo/frontend/static/common/third_party/js/jquery.min.js b/milo/frontend/appengine/static/common/third_party/js/jquery.min.js
similarity index 100%
rename from milo/frontend/static/common/third_party/js/jquery.min.js
rename to milo/frontend/appengine/static/common/third_party/js/jquery.min.js
diff --git a/milo/frontend/static/common/third_party/js/moment-timezone-with-data-2012-2022.min.js b/milo/frontend/appengine/static/common/third_party/js/moment-timezone-with-data-2012-2022.min.js
similarity index 100%
rename from milo/frontend/static/common/third_party/js/moment-timezone-with-data-2012-2022.min.js
rename to milo/frontend/appengine/static/common/third_party/js/moment-timezone-with-data-2012-2022.min.js
diff --git a/milo/frontend/static/common/third_party/js/moment-with-locales.min.js b/milo/frontend/appengine/static/common/third_party/js/moment-with-locales.min.js
similarity index 100%
rename from milo/frontend/static/common/third_party/js/moment-with-locales.min.js
rename to milo/frontend/appengine/static/common/third_party/js/moment-with-locales.min.js
diff --git a/milo/frontend/static/include.yaml b/milo/frontend/appengine/static/include.yaml
similarity index 100%
rename from milo/frontend/static/include.yaml
rename to milo/frontend/appengine/static/include.yaml
diff --git a/milo/frontend/templates/includes/base.html b/milo/frontend/appengine/templates/includes/base.html
similarity index 100%
rename from milo/frontend/templates/includes/base.html
rename to milo/frontend/appengine/templates/includes/base.html
diff --git a/milo/frontend/templates/pages/build.html b/milo/frontend/appengine/templates/pages/build.html
similarity index 100%
rename from milo/frontend/templates/pages/build.html
rename to milo/frontend/appengine/templates/pages/build.html
diff --git a/milo/frontend/templates/pages/builder.html b/milo/frontend/appengine/templates/pages/builder.html
similarity index 100%
rename from milo/frontend/templates/pages/builder.html
rename to milo/frontend/appengine/templates/pages/builder.html
diff --git a/milo/frontend/templates/pages/configs.html b/milo/frontend/appengine/templates/pages/configs.html
similarity index 100%
rename from milo/frontend/templates/pages/configs.html
rename to milo/frontend/appengine/templates/pages/configs.html
diff --git a/milo/frontend/templates/pages/console.html b/milo/frontend/appengine/templates/pages/console.html
similarity index 100%
rename from milo/frontend/templates/pages/console.html
rename to milo/frontend/appengine/templates/pages/console.html
diff --git a/milo/frontend/templates/pages/error.html b/milo/frontend/appengine/templates/pages/error.html
similarity index 100%
rename from milo/frontend/templates/pages/error.html
rename to milo/frontend/appengine/templates/pages/error.html
diff --git a/milo/frontend/templates/pages/frontpage.html b/milo/frontend/appengine/templates/pages/frontpage.html
similarity index 100%
rename from milo/frontend/templates/pages/frontpage.html
rename to milo/frontend/appengine/templates/pages/frontpage.html
diff --git a/milo/frontend/templates/pages/log.html b/milo/frontend/appengine/templates/pages/log.html
similarity index 100%
rename from milo/frontend/templates/pages/log.html
rename to milo/frontend/appengine/templates/pages/log.html
diff --git a/milo/frontend/templates/pages/settings.html b/milo/frontend/appengine/templates/pages/settings.html
similarity index 100%
rename from milo/frontend/templates/pages/settings.html
rename to milo/frontend/appengine/templates/pages/settings.html
diff --git a/milo/frontend/main.go b/milo/frontend/main.go
index 6ce8061..6aa1489 100644
--- a/milo/frontend/main.go
+++ b/milo/frontend/main.go
@@ -30,7 +30,7 @@
}
// Where it all begins!!!
-func init() {
+func Run() {
// Register plain ol' http handlers.
r := router.New()
gaemiddleware.InstallHandlers(r)
diff --git a/milo/frontend/static/common/auth b/milo/frontend/static/common/auth
deleted file mode 120000
index aa628db..0000000
--- a/milo/frontend/static/common/auth
+++ /dev/null
@@ -1 +0,0 @@
-../../../../server/static/auth
\ No newline at end of file
diff --git a/milo/frontend/static/common/bower_components b/milo/frontend/static/common/bower_components
deleted file mode 120000
index eb3b854..0000000
--- a/milo/frontend/static/common/bower_components
+++ /dev/null
@@ -1 +0,0 @@
-../../../../server/static/bower_components
\ No newline at end of file
diff --git a/milo/frontend/static/common/rpc b/milo/frontend/static/common/rpc
deleted file mode 120000
index 59c642f..0000000
--- a/milo/frontend/static/common/rpc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../server/static/rpc
\ No newline at end of file
diff --git a/milo/frontend/static/common/rpcexplorer b/milo/frontend/static/common/rpcexplorer
deleted file mode 120000
index 3299cfb..0000000
--- a/milo/frontend/static/common/rpcexplorer
+++ /dev/null
@@ -1 +0,0 @@
-../../../../server/static/rpcexplorer
\ No newline at end of file
diff --git a/milo/frontend/templates b/milo/frontend/templates
new file mode 120000
index 0000000..b2ca99b
--- /dev/null
+++ b/milo/frontend/templates
@@ -0,0 +1 @@
+./appengine/templates/
\ No newline at end of file
