Skip to content

Commit 6aeb6d3

Browse files
committed
all: remove grpc.go4.org dependency
Updates module dependencies. Also, update the default Go versions, which are still explicitly set during deployment. This is a follow-up to CL 361454, which removes grpc.go4.org in the x/build repository. Change-Id: I3d522c6930da22156ca2e76e6a1a663b71cef8ba Reviewed-on: https://go-review.googlesource.com/c/playground/+/393696 Trust: Alex Rakoczy <alex@golang.org> Run-TryBot: Alex Rakoczy <alex@golang.org> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Carlos Amedee <carlos@golang.org>
1 parent 28ff678 commit 6aeb6d3

File tree

7 files changed

+528
-141
lines changed

7 files changed

+528
-141
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# GO_VERSION is provided by Cloud Build, and is set to the latest
1212
# version of Go. See the configuration in the deploy directory.
13-
ARG GO_VERSION=go1.16
13+
ARG GO_VERSION=go1.18
1414

1515
############################################################################
1616
# Build Go at GO_VERSION, and build faketime standard library.
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y ${BUILD_DEPS} --no-install-recommends
2222

2323
ENV GOPATH /go
2424
ENV GOROOT_BOOTSTRAP=/usr/local/go-bootstrap
25-
ENV GO_BOOTSTRAP_VERSION go1.16
25+
ENV GO_BOOTSTRAP_VERSION go1.18
2626
ARG GO_VERSION
2727
ENV GO_VERSION ${GO_VERSION}
2828

cmd/latestgo/main.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,28 @@ package main
77

88
import (
99
"context"
10+
"crypto/tls"
1011
"flag"
1112
"fmt"
1213
"log"
14+
"time"
1315

1416
"golang.org/x/build/maintner/maintnerd/apipb"
15-
grpc "grpc.go4.org"
17+
"google.golang.org/grpc"
18+
"google.golang.org/grpc/credentials"
1619
)
1720

1821
var prev = flag.Bool("prev", false, "whether to query the previous Go release, rather than the last (e.g. 1.17 versus 1.18)")
1922

20-
const maintnerURI = "https://maintner.golang.org"
23+
const maintnerURI = "maintner.golang.org:443"
2124

2225
func main() {
2326
flag.Parse()
2427

25-
conn, err := grpc.NewClient(nil, maintnerURI)
28+
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
29+
defer cancel()
30+
conn, err := grpc.DialContext(ctx, maintnerURI, grpc.WithBlock(),
31+
grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{NextProtos: []string{"h2"}})))
2632
if err != nil {
2733
log.Fatalf("error creating grpc client for %q: %v", maintnerURI, err)
2834
}

go.mod

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,50 @@
11
module golang.org/x/playground
22

3-
go 1.12
3+
go 1.17
44

55
require (
6-
cloud.google.com/go v0.54.0
7-
cloud.google.com/go/datastore v1.1.0
8-
cloud.google.com/go/pubsub v1.3.1 // indirect
9-
contrib.go.opencensus.io/exporter/prometheus v0.1.0
10-
contrib.go.opencensus.io/exporter/stackdriver v0.13.1
11-
github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
12-
github.com/google/go-cmp v0.4.0
13-
go.opencensus.io v0.22.3
14-
golang.org/x/build v0.0.0-20190709001953-30c0e6b89ea0
15-
golang.org/x/mod v0.2.0
16-
golang.org/x/tools v0.0.0-20200420001825-978e26b7c37c
17-
google.golang.org/api v0.20.0
18-
google.golang.org/appengine v1.6.5 // indirect
19-
google.golang.org/genproto v0.0.0-20200312145019-da6875a35672
20-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
21-
gopkg.in/yaml.v2 v2.2.7 // indirect
22-
grpc.go4.org v0.0.0-20170609214715-11d0a25b4919
6+
cloud.google.com/go/compute v1.5.0
7+
cloud.google.com/go/datastore v1.6.0
8+
contrib.go.opencensus.io/exporter/prometheus v0.4.0
9+
contrib.go.opencensus.io/exporter/stackdriver v0.13.10
10+
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
11+
github.com/google/go-cmp v0.5.7
12+
go.opencensus.io v0.23.0
13+
golang.org/x/build v0.0.0-20220317191122-8c691c32c35f
14+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
15+
golang.org/x/tools v0.1.10
16+
google.golang.org/api v0.73.0
17+
google.golang.org/appengine v1.6.7
18+
google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e
19+
google.golang.org/grpc v1.45.0
20+
)
21+
22+
require (
23+
cloud.google.com/go v0.100.2 // indirect
24+
cloud.google.com/go/monitoring v1.4.0 // indirect
25+
cloud.google.com/go/trace v1.2.0 // indirect
26+
github.com/aws/aws-sdk-go v1.43.20 // indirect
27+
github.com/beorn7/perks v1.0.1 // indirect
28+
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
29+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
30+
github.com/go-kit/log v0.2.0 // indirect
31+
github.com/go-logfmt/logfmt v0.5.1 // indirect
32+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
33+
github.com/golang/protobuf v1.5.2 // indirect
34+
github.com/googleapis/gax-go/v2 v2.2.0 // indirect
35+
github.com/jmespath/go-jmespath v0.4.0 // indirect
36+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
37+
github.com/prometheus/client_golang v1.12.1 // indirect
38+
github.com/prometheus/client_model v0.2.0 // indirect
39+
github.com/prometheus/common v0.32.1 // indirect
40+
github.com/prometheus/procfs v0.7.3 // indirect
41+
github.com/prometheus/statsd_exporter v0.22.4 // indirect
42+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
43+
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
44+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
45+
golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf // indirect
46+
golang.org/x/text v0.3.7 // indirect
47+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
48+
google.golang.org/protobuf v1.27.1 // indirect
49+
gopkg.in/yaml.v2 v2.4.0 // indirect
2350
)

0 commit comments

Comments
 (0)