Running make bins with go 1.16.7

iamrodrigo · Aug 20, 2021 · 36e20d8 · 36e20d8
1 parent 75e3dcf
commit 36e20d8
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/client/clientBean.go b/client/clientBean.go
@@ -126,7 +126,7 @@ func NewClientBean(factory Factory, dispatcherProvider DispatcherProvider, clust
 		var authProvider clientworker.AuthorizationProvider
 		if info.AuthorizationProvider.Enable {
 			authProvider, err = authorization.GetAuthProviderClient(info.AuthorizationProvider.PrivateKey)
-			if err != nil{
+			if err != nil {
 				return nil, err
 			}
 		}

diff --git a/cmd/server/tools.go b/cmd/server/tools.go
@@ -18,6 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//go:build tools
 // +build tools
 
 package tools

diff --git a/common/authorization/factory_test.go b/common/authorization/factory_test.go
@@ -62,8 +62,8 @@ func cfgOAuth() config.Authorization {
 		OAuthAuthorizer: config.OAuthAuthorizer{
 			Enable: true,
 			JwtCredentials: config.JwtCredentials{
-				Algorithm:  jwt.RS256.String(),
-				PublicKey:  "public",
+				Algorithm: jwt.RS256.String(),
+				PublicKey: "public",
 			},
 			MaxJwtTTL: 12345,
 		},

diff --git a/common/authorization/oauthAutorizer_test.go b/common/authorization/oauthAutorizer_test.go
@@ -64,8 +64,8 @@ func (s *oauthSuite) SetupTest() {
 	s.cfg = config.OAuthAuthorizer{
 		Enable: true,
 		JwtCredentials: config.JwtCredentials{
-			Algorithm:  jwt.RS256.String(),
-			PublicKey:  "../../config/credentials/keytest.pub",
+			Algorithm: jwt.RS256.String(),
+			PublicKey: "../../config/credentials/keytest.pub",
 		},
 		MaxJwtTTL: 300000001,
 	}

diff --git a/common/config/authorization_test.go b/common/config/authorization_test.go
@@ -61,8 +61,8 @@ func TestPrivateKeyIsEmpty(t *testing.T) {
 		OAuthAuthorizer: OAuthAuthorizer{
 			Enable: true,
 			JwtCredentials: JwtCredentials{
-				Algorithm:  "",
-				PublicKey:  "",
+				Algorithm: "",
+				PublicKey: "",
 			},
 			MaxJwtTTL: 1000000,
 		},
@@ -80,8 +80,8 @@ func TestPublicKeyIsEmpty(t *testing.T) {
 		OAuthAuthorizer: OAuthAuthorizer{
 			Enable: true,
 			JwtCredentials: JwtCredentials{
-				Algorithm:  "",
-				PublicKey:  "",
+				Algorithm: "",
+				PublicKey: "",
 			},
 			MaxJwtTTL: 1000000,
 		},
@@ -99,8 +99,8 @@ func TestAlgorithmIsInvalid(t *testing.T) {
 		OAuthAuthorizer: OAuthAuthorizer{
 			Enable: true,
 			JwtCredentials: JwtCredentials{
-				Algorithm:  "SHA256",
-				PublicKey:  "public",
+				Algorithm: "SHA256",
+				PublicKey: "public",
 			},
 			MaxJwtTTL: 1000000,
 		},
@@ -118,8 +118,8 @@ func TestCorrectValidation(t *testing.T) {
 		OAuthAuthorizer: OAuthAuthorizer{
 			Enable: true,
 			JwtCredentials: JwtCredentials{
-				Algorithm:  "RS256",
-				PublicKey:  "public",
+				Algorithm: "RS256",
+				PublicKey: "public",
 			},
 			MaxJwtTTL: 1000000,
 		},

diff --git a/common/domain/failover_watcher_test.go b/common/domain/failover_watcher_test.go
@@ -32,6 +32,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"github.com/uber-go/tally"
+
 	"github.com/uber/cadence/common"
 	"github.com/uber/cadence/common/cache"
 	"github.com/uber/cadence/common/clock"

diff --git a/host/elastic_search_test.go b/host/elastic_search_test.go
@@ -18,6 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//go:build esintegration
 // +build esintegration
 
 // to run locally, make sure kafka and es is running,

diff --git a/host/xdc/elasticsearch_test.go b/host/xdc/elasticsearch_test.go
@@ -18,8 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-// +build !race
-// +build esintegration
+//go:build !race && esintegration
+// +build !race,esintegration
 
 // to run locally, make sure kafka and es is running,
 // then run cmd `go test -v ./host/xdc -run TestESCrossDCTestSuite -tags esintegration`

diff --git a/host/xdc/integration_failover_test.go b/host/xdc/integration_failover_test.go
@@ -18,7 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//go:build !race
 // +build !race
+
 // need to run xdc tests with race detector off because of ringpop bug causing data race issue
 
 package xdc