chore: update infra to 1.17 (#1184)

codyoss · web-flow · commit 7205eb60d7d7 · 2021-08-25T21:30:37.000Z
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -15,7 +15,7 @@
   ],
   "force": {
     "constraints": {
-      "go": "1.16"
+      "go": "1.17"
     }
   }
 }
diff --git a/integration-tests/impersonate/impersonate_test.go b/integration-tests/impersonate/impersonate_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build integration
 // +build integration
 
 package impersonate
diff --git a/integration-tests/storage/integration_test.go b/integration-tests/storage/integration_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build integration
 // +build integration
 
 package storage
diff --git a/internal/gensupport/retryable_linux.go b/internal/gensupport/retryable_linux.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build linux
 // +build linux
 
 package gensupport
diff --git a/internal/kokoro/vet.sh b/internal/kokoro/vet.sh
@@ -7,7 +7,7 @@
 # Fail on error, and display commands being run.
 set -ex
 
-if [[ $(go version) != *"go1.16"* ]]; then
+if [[ $(go version) != *"go1.17"* ]]; then
   exit 0
 fi
 
diff --git a/option/credentials_go19.go b/option/credentials_go19.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.9
 // +build go1.9
 
 package option
diff --git a/option/credentials_notgo19.go b/option/credentials_notgo19.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !go1.9
 // +build !go1.9
 
 package option
diff --git a/tools.go b/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 // Copyright 2019 Google LLC.
diff --git a/transport/go19.go b/transport/go19.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.9
 // +build go1.9
 
 package transport
diff --git a/transport/grpc/dial_appengine.go b/transport/grpc/dial_appengine.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build appengine
 // +build appengine
 
 package grpc
diff --git a/transport/grpc/dial_socketopt.go b/transport/grpc/dial_socketopt.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.11 && linux
 // +build go1.11,linux
 
 package grpc
diff --git a/transport/grpc/dial_socketopt_test.go b/transport/grpc/dial_socketopt_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.11 && linux
 // +build go1.11,linux
 
 package grpc
diff --git a/transport/http/configure_http2_go116.go b/transport/http/configure_http2_go116.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.16
 // +build go1.16
 
 package http
diff --git a/transport/http/configure_http2_not_go116.go b/transport/http/configure_http2_not_go116.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !go1.16
 // +build !go1.16
 
 package http
diff --git a/transport/http/default_transport_go113.go b/transport/http/default_transport_go113.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.13
 // +build go1.13
 
 package http
diff --git a/transport/http/default_transport_not_go113.go b/transport/http/default_transport_not_go113.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !go1.13
 // +build !go1.13
 
 package http
diff --git a/transport/http/dial_appengine.go b/transport/http/dial_appengine.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build appengine
 // +build appengine
 
 package http
diff --git a/transport/http/internal/propagation/http.go b/transport/http/internal/propagation/http.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.8
 // +build go1.8
 
 // Package propagation implements X-Cloud-Trace-Context header propagation used
diff --git a/transport/http/internal/propagation/http_test.go b/transport/http/internal/propagation/http_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.8
 // +build go1.8
 
 package propagation
diff --git a/transport/not_go19.go b/transport/not_go19.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !go1.9
 // +build !go1.9
 
 package transport

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`],`
`16`	`16`	`"force": {`
`17`	`17`	`"constraints": {`
`18`		`- "go": "1.16"`
	`18`	`+ "go": "1.17"`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build tools`
`1`	`2`	`// +build tools`
`2`	`3`
`3`	`4`	`// Copyright 2019 Google LLC.`