summaryrefslogtreecommitdiffhomepage
path: root/cmd
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2019-04-25 23:04:06 -0700
committerAdin Scannell <adin@scannell.ca>2019-04-26 16:07:24 -0700
commit921bd3ae92a287a804ab10e943ee1c4a498a816a (patch)
treece789ae7c6e8478dab3d9def917f669a614e8420 /cmd
parent66cc254a8710cdaeb6e56bb45aec1e51f696660a (diff)
cmd/gvisor-website: add /rebuild and cron
In order to ensure that the system call descriptions and other documentation that will be sourced from the main repository remains up to date, add a hook that allows the site to submit a rebuild to Google Cloud Builder. This can be triggered manually by an admin, or will be triggered every 24 hours by a new cron configuration.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/gvisor-website/app.yaml3
-rw-r--r--cmd/gvisor-website/cron.yaml4
-rw-r--r--cmd/gvisor-website/go.mod8
-rw-r--r--cmd/gvisor-website/go.sum50
-rw-r--r--cmd/gvisor-website/main.go84
5 files changed, 134 insertions, 15 deletions
diff --git a/cmd/gvisor-website/app.yaml b/cmd/gvisor-website/app.yaml
index 863789be2..98b3e681b 100644
--- a/cmd/gvisor-website/app.yaml
+++ b/cmd/gvisor-website/app.yaml
@@ -18,3 +18,6 @@ handlers:
- url: /.*
secure: always
script: auto
+ - url: /rebuild
+ secure: always
+ login: admin
diff --git a/cmd/gvisor-website/cron.yaml b/cmd/gvisor-website/cron.yaml
new file mode 100644
index 000000000..b4f79955c
--- /dev/null
+++ b/cmd/gvisor-website/cron.yaml
@@ -0,0 +1,4 @@
+cron:
+- description: "daily rebuild"
+ url: /rebuild
+ schedule: every 24 hours
diff --git a/cmd/gvisor-website/go.mod b/cmd/gvisor-website/go.mod
new file mode 100644
index 000000000..6cffff4b4
--- /dev/null
+++ b/cmd/gvisor-website/go.mod
@@ -0,0 +1,8 @@
+module main
+
+go 1.12
+
+require (
+ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421
+ google.golang.org/api v0.4.0
+)
diff --git a/cmd/gvisor-website/go.sum b/cmd/gvisor-website/go.sum
new file mode 100644
index 000000000..f90c16963
--- /dev/null
+++ b/cmd/gvisor-website/go.sum
@@ -0,0 +1,50 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+google.golang.org/api v0.4.0 h1:KKgc1aqhV8wDPbDzlDtpvyjZFY3vjz85FP7p4wcQUyI=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/cmd/gvisor-website/main.go b/cmd/gvisor-website/main.go
index 6ae1881c2..82364b6fe 100644
--- a/cmd/gvisor-website/main.go
+++ b/cmd/gvisor-website/main.go
@@ -1,22 +1,21 @@
-/*
-Copyright 2019 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
package main
import (
+ "context"
"flag"
"fmt"
"log"
@@ -24,6 +23,10 @@ import (
"os"
"regexp"
"strings"
+
+ // For triggering manual rebuilds.
+ "golang.org/x/oauth2/google"
+ "google.golang.org/api/cloudbuild/v1"
)
var redirects = map[string]string{
@@ -120,6 +123,56 @@ func registerStatic(mux *http.ServeMux, staticDir string) {
mux.Handle("/", hostRedirectHandler(http.FileServer(http.Dir(staticDir))))
}
+// registerRebuild registers the rebuild handler.
+func registerRebuild(mux *http.ServeMux) {
+ if mux == nil {
+ mux = http.DefaultServeMux
+ }
+
+ mux.Handle("/rebuild", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ ctx := context.Background()
+ credentials, err := google.FindDefaultCredentials(ctx, cloudbuild.CloudPlatformScope)
+ if err != nil {
+ http.Error(w, "credentials error: "+err.Error(), 500)
+ return
+ }
+ cloudbuildService, err := cloudbuild.NewService(ctx)
+ if err != nil {
+ http.Error(w, "cloudbuild service error: "+err.Error(), 500)
+ return
+ }
+ projectID := credentials.ProjectID
+ if projectID == "" {
+ // If running locally, then this project will not be
+ // available. Use the default project here.
+ projectID = "gvisor-website"
+ }
+ triggers, err := cloudbuildService.Projects.Triggers.List(projectID).Do()
+ if err != nil {
+ http.Error(w, "trigger list error: "+err.Error(), 500)
+ return
+ }
+ if len(triggers.Triggers) < 1 {
+ http.Error(w, "trigger list error: no triggers", 500)
+ return
+ }
+ if _, err := cloudbuildService.Projects.Triggers.Run(
+ projectID,
+ triggers.Triggers[0].Id,
+ &cloudbuild.RepoSource{
+ // In the current project, require that a
+ // github cloud source repository exists with
+ // the given name, and build from master.
+ BranchName: "master",
+ RepoName: "github_google_gvisor-website",
+ ProjectId: projectID,
+ }).Do(); err != nil {
+ http.Error(w, "run error: "+err.Error(), 500)
+ return
+ }
+ }))
+}
+
func envFlagString(name, def string) string {
if val := os.Getenv(name); val != "" {
return val
@@ -136,6 +189,7 @@ func main() {
flag.Parse()
registerRedirects(nil)
+ registerRebuild(nil)
registerStatic(nil, *staticDir)
log.Fatal(http.ListenAndServe(*addr, nil))