New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x/tools/godoc: backport Flex changes onto release-branch.go1.11 #28893

Closed
dmitshur opened this Issue Nov 20, 2018 · 14 comments

Comments

Projects
None yet
2 participants
@dmitshur
Member

dmitshur commented Nov 20, 2018

There have been changes done to allow cmd/godoc to deploy to Flex environment in #27205.

They were done on master branch (of tools subrepo) but not backported to release-branch.go1.11 branch (of tools subrepo).

This issue is about resolving that. That way, it'll be possible to use release-branch.go1.11 to deploy the latest golang.org website, and be able to cherry-pick additional fixes to it. /cc @bradfitz @broady

Edit: Resolving this issue has made it possible to do #28836 (comment).

@gopherbot gopherbot added this to the Unreleased milestone Nov 20, 2018

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150597 mentions this issue: [release-branch.go1.11] cmd/godoc: simplify dev and prod environment for App Engine

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150598 mentions this issue: [release-branch.go1.11] godoc/dl: add dmitshur, katiehockman to binary upload whitelist

gopherbot pushed a commit to golang/tools that referenced this issue Nov 20, 2018

[release-branch.go1.11] cmd/godoc: simplify dev and prod environment …
…for App Engine

Remove all of the code generation and the concept of "APPDIR" - just
generate godoc.zip and index files in the app directory.

Simplify generation of the zip - use a symlink so that every file in
godoc.zip is under the "goroot" directory, regardless of the
environment. Previously, the prefix would be dependent on the location
of the user's GOROOT.

Running the setup script is now optional - it's now possible to run
dev_appserver.py on a regular checkout of cmd/godoc without godoc.zip
and search index files. Use environment variables to switch whether the
zip file is used vs reading GOROOT from the filesystem.

Updates golang/go#28893

Change-Id: I1ce95c891717fe2da975f979778fd775b23f18c8
Reviewed-on: https://go-review.googlesource.com/46725
Reviewed-by: Andrew Bonventre <andybons@golang.org>
(cherry picked from commit e9ca907)
Reviewed-on: https://go-review.googlesource.com/c/150597
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150599 mentions this issue: [release-branch.go1.11] godoc: migrate to App Engine flexible

gopherbot pushed a commit to golang/tools that referenced this issue Nov 20, 2018

[release-branch.go1.11] godoc/dl: add dmitshur, katiehockman to binar…
…y upload whitelist

This is for uploading Go release binaries to dl.google.com with
x/build/cmd/release.

Updates golang/go#28893
Updates golang/go#27953

Change-Id: Idc9e5d5c4cf4c1e5602b51cc1159c982038c7901
Reviewed-on: https://go-review.googlesource.com/138879
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
(cherry picked from commit b71db7f)
Reviewed-on: https://go-review.googlesource.com/c/150598
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150600 mentions this issue: [release-branch.go1.11] godoc: move third-party godoc deps behind build tag

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150678 mentions this issue: [release-branch.go1.11] cmd/godoc: improve deployment scripts, add buildinfo

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150685 mentions this issue: [release-branch.go1.11] cmd/godoc: start RunIndexer synchronously when index is present

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150679 mentions this issue: [release-branch.go1.11] cmd/godoc: re-enable host checking, allow test versions

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150683 mentions this issue: [release-branch.go1.11] cmd/godoc: add version info for golang.org

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150682 mentions this issue: [release-branch.go1.11] cmd/godoc: add cloud build config

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150681 mentions this issue: [release-branch.go1.11] cmd/godoc: add make publish to migrate traffic

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150677 mentions this issue: [release-branch.go1.11] godoc/static: regenerate

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150680 mentions this issue: [release-branch.go1.11] cmd/godoc: move regression tests to a go test

@gopherbot

This comment has been minimized.

gopherbot commented Nov 20, 2018

Change https://golang.org/cl/150684 mentions this issue: [release-branch.go1.11] cmd/godoc: add missing Dockerfile ARG

gopherbot pushed a commit to golang/tools that referenced this issue Nov 20, 2018

[release-branch.go1.11] godoc: migrate to App Engine flexible
See bug for more details on exactly what was migrated.

Notably:
* No more Google-internal deployment scripts; see README.godoc-app and
  the Makefile for details.
* Build tag "golangorg" is used for the godoc configuration used for
  golang.org.
* Use of App Engine libraries replaced with GCP client libraries.
* Redis is used to replace App Engine memcache.
* Google analytics is controlled by an environment variable.
* Regression tests have been migrated from Google-internal.
* hg -> git hash map is moved from Google-internal.

Updates golang/go#28893
Updates golang/go#27205

Change-Id: Ia0a983f239c50eda8be2363494c8b784f60c2c6d
Reviewed-on: https://go-review.googlesource.com/133355
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150599

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] godoc/static: regenerate
I must have forgotten to re-generate after rebasing from upstream.

Updates golang/go#28893

Change-Id: I3465cd4cce9f4b6fd6e94fc51dc42b5efd11052b
Reviewed-on: https://go-review.googlesource.com/138977
Reviewed-by: Andrew Gerrand <adg@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150677
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] godoc: move third-party godoc deps behind bui…
…ld tag

Updates golang/go#28893
Updates golang/go#27970

Change-Id: I6de10c260f31721bf83073ef5b140442c3ef7eb0
Reviewed-on: https://go-review.googlesource.com/c/139197
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Chris Broadfoot <cbro@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150600
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] cmd/godoc: improve deployment scripts, add bu…
…ildinfo

* Build Go from a given version (make.bash)
* Add a /buildinfo file that describes the inputs of the
  build/deployment.
* Use Makefile/environment variables to override Go version and
  Docker tag.

Updates golang/go#28893
Updates golang/go#27205

Change-Id: Ia7a88b75f9d5b2319d2381e56bc963eb53e889c7
Reviewed-on: https://go-review.googlesource.com/c/138978
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150678

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] cmd/godoc: re-enable host checking, allow tes…
…t versions

test.golang.org is no longer -- instead allow access to version-specific
App Engine URLs (like 20181002t1342-dot-golang-org.appspot.com).

App Engine Flex uses the X-Forwarded-Proto to signify the proto used by
the originating request (it always uses h1 on 8080 when proxying the
request).

Updates golang/go#28893
Updates golang/go#27205

Change-Id: I423ffe65df325500a2fa04c7b655797ecc6ad037
Reviewed-on: https://go-review.googlesource.com/c/139237
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150679

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] cmd/godoc: move regression tests to a go test
Run them separately from the other tests in godoc_test by requiring a
regtest.host flag and by filtering on the test name.

Updates golang/go#28893
Updates golang/go#27205

Change-Id: I166d2278a3f6954307f7c935567a81e73f78e7bb
Reviewed-on: https://go-review.googlesource.com/c/139238
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150680

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] cmd/godoc: add `make publish` to migrate traffic
Also rename `make build` and `make push` to `make docker-build` and
`make docker-push` in preparation to introduce Cloud Build (removing
the dependency on Docker).

Updates golang/go#28893
Updates golang/go#27205

Change-Id: Iae19b9a6f77d09246a1332c7ec9eceec449cdba8
Reviewed-on: https://go-review.googlesource.com/c/139239
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150681

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] cmd/godoc: add cloud build config
Deploys no longer depend on Docker.

With only Make and gcloud installed, the following should deploy a new version:

$ git clone https://go.googlesource.com/tools
$ cd tools
$ cd cmd/godoc
$ make cloud-build deploy

Updates golang/go#28893
Updates golang/go#27205

Change-Id: I5cc1142e02dc288450d55dbd4da4b30c0a080bd5
Reviewed-on: https://go-review.googlesource.com/c/139240
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150682

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] cmd/godoc: add version info for golang.org
Adds version information for package docs for the production version of
godoc running on golang.org.

Updates golang/go#28893
Updates golang/go#5778

Change-Id: I8b56e8152b20b34104f274263a6c0b5a0180093b
Reviewed-on: https://go-review.googlesource.com/c/139557
Reviewed-by: Devon H. O'Dell <devon.odell@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150683

gopherbot pushed a commit to golang/tools that referenced this issue Nov 21, 2018

[release-branch.go1.11] cmd/godoc: add missing Dockerfile ARG
Also moves the ARG declarations immediately before they're used to
make this omission less likely for future additions.

Updates golang/go#28893

Change-Id: Id52a936d978f96d3c629feff69fc9dc4ae1b8463
Reviewed-on: https://go-review.googlesource.com/c/140377
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-on: https://go-review.googlesource.com/c/150684
@dmitshur

This comment has been minimized.

Member

dmitshur commented Nov 21, 2018

This is done now. Twelve CLs have been backported.

@dmitshur dmitshur closed this Nov 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment