update to go 1.11 and new goreleaser

apigee · Sep 11, 2018 · 10955c9 · 10955c9
1 parent c52fa57
commit 10955c9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2
 jobs:
   build-and-test:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.11
     working_directory: /go/src/github.com/apigee/istio-mixer-adapter
     steps:
       - checkout
@@ -29,7 +29,7 @@ jobs:
 
   build-test-image:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.11
     working_directory: /go/src/github.com/apigee/istio-mixer-adapter
     steps:
       - checkout
@@ -66,7 +66,7 @@ jobs:
 
   build-nightly:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.11
     working_directory: /go/src/github.com/apigee/istio-mixer-adapter
     steps:
       - checkout

diff --git a/adapter/product/manager_test.go b/adapter/product/manager_test.go
@@ -162,7 +162,7 @@ func TestManagerPolling(t *testing.T) {
 		t.Errorf("number of products should not have incremented")
 	}
 
-	time.Sleep(opts.RefreshRate * 4)
+	time.Sleep(opts.RefreshRate * 10)
 	pp2 = len(pp.Products())
 	if pp1 == pp2 {
 		t.Errorf("number of products should have incremented")

diff --git a/adapter/util/util.go b/adapter/util/util.go
@@ -21,7 +21,7 @@ import (
 
 // SprintfRedacts truncates secret strings to len(5)
 func SprintfRedacts(redacts []interface{}, format string, a ...interface{}) string {
-	s := fmt.Sprintf(format, a)
+	s := fmt.Sprintf(format, a...)
 	for _, r := range redacts {
 		if r, ok := r.(string); ok {
 			truncated := Truncate(r, 5)

diff --git a/bin/build_release.sh b/bin/build_release.sh
@@ -44,7 +44,10 @@ fi
 
 if [[ `command -v goreleaser` == "" ]]; then
   echo "goreleaser not installed, installing..."
-  go get github.com/goreleaser/goreleaser
+  cd "${GOPATH}/bin/"
+  wget https://github.com/goreleaser/goreleaser/releases/download/v0.85.2/goreleaser_Linux_x86_64.tar.gz
+  tar xfz goreleaser_Linux_x86_64.tar.gz goreleaser
+  rm goreleaser_Darwin_x86_64.tar.gz
 fi
 
 ADAPTER_DIR="${GOPATH}/src/github.com/apigee/istio-mixer-adapter"