aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Donnellan <ajd@linux.ibm.com>2019-10-11 13:40:59 +1100
committerDmitry Vyukov <dvyukov@google.com>2020-01-29 16:01:06 +0100
commitc7484f62922a106cd69af6fb3ef96f221ee6c880 (patch)
tree6ed37b09110e05e5bb5bf9b312e72875cba83748
parentc8e81ce4c7e3b59e7c83c6fab56c217916f3b3b6 (diff)
dashboard: update to go111 runtime
The old go 1.9 App Engine runtime is now deprecated. Update to the go 1.11 runtime, which still allows us to use the old App Engine library (removed in the 1.12 runtime). Closes: #1461 ("dashboard: port app to go111/go112 runtime") Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com>
-rw-r--r--dashboard/app/access.go2
-rw-r--r--dashboard/app/access_test.go2
-rw-r--r--dashboard/app/admin.go2
-rw-r--r--dashboard/app/aetest.go2
-rw-r--r--dashboard/app/api.go2
-rw-r--r--dashboard/app/app.yaml11
-rw-r--r--dashboard/app/app_test.go2
-rw-r--r--dashboard/app/bisect_test.go2
-rw-r--r--dashboard/app/commit_poll_test.go2
-rw-r--r--dashboard/app/config.go2
-rw-r--r--dashboard/app/dashboard.go12
-rw-r--r--dashboard/app/email_test.go2
-rw-r--r--dashboard/app/empty_test.go2
-rw-r--r--dashboard/app/entities.go2
-rw-r--r--dashboard/app/fix_test.go2
-rw-r--r--dashboard/app/handler.go2
-rw-r--r--dashboard/app/jobs.go2
-rw-r--r--dashboard/app/jobs_test.go2
-rw-r--r--dashboard/app/main.go2
-rw-r--r--dashboard/app/noaetest.go2
-rw-r--r--dashboard/app/notifications_test.go2
-rw-r--r--dashboard/app/reporting.go2
-rw-r--r--dashboard/app/reporting_email.go2
-rw-r--r--dashboard/app/reporting_external.go2
-rw-r--r--dashboard/app/reporting_test.go2
-rw-r--r--dashboard/app/repro_test.go2
-rw-r--r--dashboard/app/util_test.go2
27 files changed, 41 insertions, 32 deletions
diff --git a/dashboard/app/access.go b/dashboard/app/access.go
index 29acef5d8..cd53094a2 100644
--- a/dashboard/app/access.go
+++ b/dashboard/app/access.go
@@ -1,7 +1,7 @@
// Copyright 2018 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"errors"
diff --git a/dashboard/app/access_test.go b/dashboard/app/access_test.go
index 10afa01c2..442034a95 100644
--- a/dashboard/app/access_test.go
+++ b/dashboard/app/access_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"bytes"
diff --git a/dashboard/app/admin.go b/dashboard/app/admin.go
index fcc48b6ce..8b2737cdd 100644
--- a/dashboard/app/admin.go
+++ b/dashboard/app/admin.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"fmt"
diff --git a/dashboard/app/aetest.go b/dashboard/app/aetest.go
index c21503c5e..3166d72c2 100644
--- a/dashboard/app/aetest.go
+++ b/dashboard/app/aetest.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
// isAppEngineTest is meant to be used in prod config to either
// load the config or just check its correctness.
diff --git a/dashboard/app/api.go b/dashboard/app/api.go
index 09313b6a6..faf2d0810 100644
--- a/dashboard/app/api.go
+++ b/dashboard/app/api.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"bytes"
diff --git a/dashboard/app/app.yaml b/dashboard/app/app.yaml
index 0e5ca351f..861c9f871 100644
--- a/dashboard/app/app.yaml
+++ b/dashboard/app/app.yaml
@@ -1,7 +1,4 @@
-application: syzkaller
-version: 1
-runtime: go
-api_version: go1
+runtime: go111
inbound_services:
- mail
@@ -20,12 +17,12 @@ handlers:
static_dir: static
secure: always
- url: /(admin|email_poll)
- script: _go_app
+ script: auto
login: admin
secure: always
- url: /_ah/(mail/.+|bounce)
- script: _go_app
+ script: auto
login: admin
- url: /(|api|bug|text|x/.+|.*)
- script: _go_app
+ script: auto
secure: always
diff --git a/dashboard/app/app_test.go b/dashboard/app/app_test.go
index 9df92447b..9030c0e64 100644
--- a/dashboard/app/app_test.go
+++ b/dashboard/app/app_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"fmt"
diff --git a/dashboard/app/bisect_test.go b/dashboard/app/bisect_test.go
index b385aa655..ed37d2ac2 100644
--- a/dashboard/app/bisect_test.go
+++ b/dashboard/app/bisect_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"bytes"
diff --git a/dashboard/app/commit_poll_test.go b/dashboard/app/commit_poll_test.go
index 48c86292f..207ea4fc6 100644
--- a/dashboard/app/commit_poll_test.go
+++ b/dashboard/app/commit_poll_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"sort"
diff --git a/dashboard/app/config.go b/dashboard/app/config.go
index 00b777a10..4b57667ab 100644
--- a/dashboard/app/config.go
+++ b/dashboard/app/config.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"encoding/json"
diff --git a/dashboard/app/dashboard.go b/dashboard/app/dashboard.go
new file mode 100644
index 000000000..971d336f6
--- /dev/null
+++ b/dashboard/app/dashboard.go
@@ -0,0 +1,12 @@
+// Copyright 2019 syzkaller project authors. All rights reserved.
+// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+package main
+
+import (
+ "google.golang.org/appengine"
+)
+
+func main() {
+ appengine.Main()
+}
diff --git a/dashboard/app/email_test.go b/dashboard/app/email_test.go
index 45949c166..0d77a4fe1 100644
--- a/dashboard/app/email_test.go
+++ b/dashboard/app/email_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"fmt"
diff --git a/dashboard/app/empty_test.go b/dashboard/app/empty_test.go
index 80096031b..341611070 100644
--- a/dashboard/app/empty_test.go
+++ b/dashboard/app/empty_test.go
@@ -1,7 +1,7 @@
// Copyright 2019 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"testing"
diff --git a/dashboard/app/entities.go b/dashboard/app/entities.go
index 8d4a74e06..1e0a42c54 100644
--- a/dashboard/app/entities.go
+++ b/dashboard/app/entities.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"fmt"
diff --git a/dashboard/app/fix_test.go b/dashboard/app/fix_test.go
index d79b69c94..33a3c5aad 100644
--- a/dashboard/app/fix_test.go
+++ b/dashboard/app/fix_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"testing"
diff --git a/dashboard/app/handler.go b/dashboard/app/handler.go
index 677c34bd1..c779f82a9 100644
--- a/dashboard/app/handler.go
+++ b/dashboard/app/handler.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"bytes"
diff --git a/dashboard/app/jobs.go b/dashboard/app/jobs.go
index 4a31d8ff1..ce40210f7 100644
--- a/dashboard/app/jobs.go
+++ b/dashboard/app/jobs.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"encoding/json"
diff --git a/dashboard/app/jobs_test.go b/dashboard/app/jobs_test.go
index 084e0770a..afa5cd106 100644
--- a/dashboard/app/jobs_test.go
+++ b/dashboard/app/jobs_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"bytes"
diff --git a/dashboard/app/main.go b/dashboard/app/main.go
index 048f25468..1196d29b7 100644
--- a/dashboard/app/main.go
+++ b/dashboard/app/main.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"bytes"
diff --git a/dashboard/app/noaetest.go b/dashboard/app/noaetest.go
index 5c461b779..b642ed66c 100644
--- a/dashboard/app/noaetest.go
+++ b/dashboard/app/noaetest.go
@@ -3,6 +3,6 @@
// +build !aetest
-package dash
+package main
const isAppEngineTest = false
diff --git a/dashboard/app/notifications_test.go b/dashboard/app/notifications_test.go
index dc35ec850..c7771a627 100644
--- a/dashboard/app/notifications_test.go
+++ b/dashboard/app/notifications_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"strings"
diff --git a/dashboard/app/reporting.go b/dashboard/app/reporting.go
index 0b7414861..d508857f1 100644
--- a/dashboard/app/reporting.go
+++ b/dashboard/app/reporting.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"bytes"
diff --git a/dashboard/app/reporting_email.go b/dashboard/app/reporting_email.go
index b88953b67..494325dde 100644
--- a/dashboard/app/reporting_email.go
+++ b/dashboard/app/reporting_email.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"bytes"
diff --git a/dashboard/app/reporting_external.go b/dashboard/app/reporting_external.go
index fe57af766..f487ac9d3 100644
--- a/dashboard/app/reporting_external.go
+++ b/dashboard/app/reporting_external.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-package dash
+package main
import (
"encoding/json"
diff --git a/dashboard/app/reporting_test.go b/dashboard/app/reporting_test.go
index a96db4f16..aad68751c 100644
--- a/dashboard/app/reporting_test.go
+++ b/dashboard/app/reporting_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"fmt"
diff --git a/dashboard/app/repro_test.go b/dashboard/app/repro_test.go
index fd08dc933..c704b9226 100644
--- a/dashboard/app/repro_test.go
+++ b/dashboard/app/repro_test.go
@@ -3,7 +3,7 @@
// +build aetest
-package dash
+package main
import (
"testing"
diff --git a/dashboard/app/util_test.go b/dashboard/app/util_test.go
index c80ab6a95..50cfefdd5 100644
--- a/dashboard/app/util_test.go
+++ b/dashboard/app/util_test.go
@@ -8,7 +8,7 @@
// +build aetest
-package dash
+package main
import (
"bytes"