Bump capacityset and webpa-common (#3)

* ran reformat * convert webpa-common/wrp to wrp-go * bump wrp-go and webpa-common * [skip ci] prepare for v0.1.2 release
xmidt-org · Jul 16, 2019 · a2c534b · a2c534b
1 parent 59e0023
commit a2c534b
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - GO111MODULE=on go mod vendor
 
 branches:
-    only:
+  only:
     - master
 
 script:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,12 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v0.1.2]
+- switched webpa-common/wrp to wrp-go
+- bumped webpa-common
+- bumped capacityset
+
 ## [v0.1.1]
 - Changed ugorji dependency
 
 ## [v0.1.0]
 - Initial creation, moved from: https://github.com/xmidt-org/codex-deploy
 
-[Unreleased]: https://github.com/xmidt-org/codex-db/compare/v0.1.1..HEAD
+[Unreleased]: https://github.com/xmidt-org/codex-db/compare/v0.1.2..HEAD
+[v0.1.2]: https://github.com/xmidt-org/codex-db/compare/0.1.1...v0.1.2
 [v0.1.1]: https://github.com/xmidt-org/codex-db/compare/0.1.0...v0.1.1
 [v0.1.0]: https://github.com/xmidt-org/codex-db/compare/0.0.0...v0.1.0
diff --git a/batchDeleter/batchDeleter.go b/batchDeleter/batchDeleter.go
@@ -27,12 +27,12 @@ import (
 
 	"github.com/xmidt-org/capacityset"
 
-	"github.com/xmidt-org/webpa-common/logging"
-	"github.com/xmidt-org/webpa-common/semaphore"
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/metrics/provider"
 	"github.com/goph/emperror"
 	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/webpa-common/logging"
+	"github.com/xmidt-org/webpa-common/semaphore"
 )
 
 const (

diff --git a/batchDeleter/batchDeleter_test.go b/batchDeleter/batchDeleter_test.go
@@ -32,8 +32,8 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/metrics/provider"
 	"github.com/stretchr/testify/assert"
-	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
 	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
 )
 
 func TestNewBatchDeleter(t *testing.T) {

diff --git a/batchDeleter/metrics.go b/batchDeleter/metrics.go
@@ -18,9 +18,9 @@
 package batchDeleter
 
 import (
-	"github.com/xmidt-org/webpa-common/xmetrics"
 	"github.com/go-kit/kit/metrics"
 	"github.com/go-kit/kit/metrics/provider"
+	"github.com/xmidt-org/webpa-common/xmetrics"
 )
 
 const (

diff --git a/batchDeleter/mocks_test.go b/batchDeleter/mocks_test.go
@@ -18,8 +18,8 @@
 package batchDeleter
 
 import (
-	"github.com/xmidt-org/codex-db"
 	"github.com/stretchr/testify/mock"
+	"github.com/xmidt-org/codex-db"
 )
 
 type mockPruner struct {

diff --git a/batchInserter/batchInserter.go b/batchInserter/batchInserter.go
@@ -25,12 +25,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/xmidt-org/webpa-common/logging"
-	"github.com/xmidt-org/webpa-common/semaphore"
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/metrics/provider"
 	"github.com/goph/emperror"
 	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/webpa-common/logging"
+	"github.com/xmidt-org/webpa-common/semaphore"
 )
 
 const (

diff --git a/batchInserter/batchInserter_test.go b/batchInserter/batchInserter_test.go
@@ -30,8 +30,8 @@ import (
 	"github.com/go-kit/kit/metrics/provider"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
 	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
 )
 
 func TestNewBatchInserter(t *testing.T) {

diff --git a/batchInserter/metrics.go b/batchInserter/metrics.go
@@ -18,9 +18,9 @@
 package batchInserter
 
 import (
-	"github.com/xmidt-org/webpa-common/xmetrics"
 	"github.com/go-kit/kit/metrics"
 	"github.com/go-kit/kit/metrics/provider"
+	"github.com/xmidt-org/webpa-common/xmetrics"
 )
 
 const (

diff --git a/batchInserter/mocks_test.go b/batchInserter/mocks_test.go
@@ -18,8 +18,8 @@
 package batchInserter
 
 import (
-	"github.com/xmidt-org/codex-db"
 	"github.com/stretchr/testify/mock"
+	"github.com/xmidt-org/codex-db"
 )
 
 type mockInserter struct {

diff --git a/blacklist/blacklist.go b/blacklist/blacklist.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/xmidt-org/webpa-common/logging"
 	"github.com/go-kit/kit/log"
+	"github.com/xmidt-org/webpa-common/logging"
 )
 
 const (

diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/goph/emperror v0.17.2
 	github.com/jinzhu/gorm v1.9.10
 	github.com/stretchr/testify v1.3.0
-	github.com/xmidt-org/capacityset v0.0.0-20190711222112-6309a9261a9f
-	github.com/xmidt-org/webpa-common v1.1.0
+	github.com/xmidt-org/capacityset v0.1.1
+	github.com/xmidt-org/webpa-common v1.3.0
+	github.com/xmidt-org/wrp-go v1.2.0
 )
diff --git a/go.sum b/go.sum
@@ -4,8 +4,6 @@ cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Comcast/webpa-common v1.1.0 h1:fS09O+7cPfubrVXuC/8PPc1QyUkhrcI01qzA1Wg92CU=
-github.com/Comcast/webpa-common v1.1.0/go.mod h1:XSu1nN06grod4RD/3WRYdeMMKDXBpeosZgIoNcmYsus=
 github.com/InVisionApp/go-health v2.1.0+incompatible h1:m5nRf/RKaMCkob7V5Vc3tuzlpqY2K9hL5awZomjzuCk=
 github.com/InVisionApp/go-health v2.1.0+incompatible/go.mod h1:/+Gv1o8JUsrjC6pi6MN6/CgKJo4OqZ6x77XAnImrzhg=
 github.com/InVisionApp/go-logger v1.0.1 h1:WFL19PViM1mHUmUWfsv5zMo379KSWj2MRmBlzMFDRiE=
@@ -202,10 +200,14 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
 github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xmidt-org/capacityset v0.0.0-20190711222112-6309a9261a9f h1:yHjD2msLpIVTY6wM6/jq0zMnmP0zKSC6RETsHSmS9eU=
-github.com/xmidt-org/capacityset v0.0.0-20190711222112-6309a9261a9f/go.mod h1:rDWYM3quhg/6Zyud2ydLeAPQbBMn0wvQBS7O/u0uwts=
-github.com/xmidt-org/webpa-common v1.1.0 h1:JG3lzyV70BpsVvKKvAn+/9uNI0wNW9H1r3qr0M+dQNM=
-github.com/xmidt-org/webpa-common v1.1.0/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI=
+github.com/xmidt-org/capacityset v0.1.1 h1:qlPBU15RMOeDr2mzZ5nwjWQsdZ867VHKIEeRFFPSBRM=
+github.com/xmidt-org/capacityset v0.1.1/go.mod h1:rJ00PZmbkdroZMiL0DOMzgkrwJddVfR1I5LmRX6YG2Y=
+github.com/xmidt-org/webpa-common v1.2.0 h1:ewB82rL5vpiY1hgt2PhG4oKGad67tH4sdIZL9zwSdus=
+github.com/xmidt-org/webpa-common v1.2.0/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI=
+github.com/xmidt-org/webpa-common v1.3.0 h1:AembEPW16kQpUWqZ8Kn1uxjdWDuCzccqFGNWoPExK14=
+github.com/xmidt-org/webpa-common v1.3.0/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI=
+github.com/xmidt-org/wrp-go v1.2.0 h1:jkn+7GcFhP8MPHJiAhI2EKI95u03wybF+MP2VdmUogU=
+github.com/xmidt-org/wrp-go v1.2.0/go.mod h1:Kw0jjKWw5e94bh5r45HYKGC1wN8IrfeZlXy298PT/2s=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=

diff --git a/healthlogger/healthlogger.go b/healthlogger/healthlogger.go
@@ -20,9 +20,9 @@ package healthlogger
 import (
 	"fmt"
 
-	"github.com/xmidt-org/webpa-common/logging"
 	hlog "github.com/InVisionApp/go-logger"
 	"github.com/go-kit/kit/log"
+	"github.com/xmidt-org/webpa-common/logging"
 )
 
 type HealthLogger struct {

diff --git a/postgresql/db.go b/postgresql/db.go
@@ -25,8 +25,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/xmidt-org/codex-db/blacklist"
 	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/codex-db/blacklist"
 
 	"github.com/go-kit/kit/metrics/provider"
 	"github.com/goph/emperror"

diff --git a/postgresql/db_test.go b/postgresql/db_test.go
@@ -23,11 +23,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/xmidt-org/codex-db"
-	"github.com/xmidt-org/webpa-common/wrp"
-	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
+	"github.com/xmidt-org/wrp-go/wrp"
 )
 
 var (

diff --git a/postgresql/executer.go b/postgresql/executer.go
@@ -24,8 +24,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/xmidt-org/codex-db/blacklist"
 	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/codex-db/blacklist"
 
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/postgres"

diff --git a/postgresql/metrics.go b/postgresql/metrics.go
@@ -18,10 +18,10 @@
 package postgresql
 
 import (
-	"github.com/xmidt-org/codex-db"
-	"github.com/xmidt-org/webpa-common/xmetrics"
 	"github.com/go-kit/kit/metrics"
 	"github.com/go-kit/kit/metrics/provider"
+	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/webpa-common/xmetrics"
 )
 
 const (

diff --git a/postgresql/mocks_test.go b/postgresql/mocks_test.go
@@ -20,8 +20,8 @@ package postgresql
 import (
 	"encoding/json"
 
-	"github.com/xmidt-org/codex-db"
 	"github.com/stretchr/testify/mock"
+	"github.com/xmidt-org/codex-db"
 )
 
 type mockFinder struct {

diff --git a/retry/metrics.go b/retry/metrics.go
@@ -18,10 +18,10 @@
 package dbretry
 
 import (
-	"github.com/xmidt-org/codex-db"
-	"github.com/xmidt-org/webpa-common/xmetrics"
 	"github.com/go-kit/kit/metrics"
 	"github.com/go-kit/kit/metrics/provider"
+	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/webpa-common/xmetrics"
 )
 
 const (

diff --git a/retry/retry.go b/retry/retry.go
@@ -24,8 +24,8 @@ package dbretry
 import (
 	"time"
 
-	"github.com/xmidt-org/codex-db/blacklist"
 	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/codex-db/blacklist"
 
 	"github.com/go-kit/kit/metrics/provider"
 )

diff --git a/retry/retry_mocks_test.go b/retry/retry_mocks_test.go
@@ -18,9 +18,9 @@
 package dbretry
 
 import (
-	"github.com/xmidt-org/codex-db/blacklist"
-	"github.com/xmidt-org/codex-db"
 	"github.com/stretchr/testify/mock"
+	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/codex-db/blacklist"
 )
 
 type mockInserter struct {

diff --git a/retry/retry_test.go b/retry/retry_test.go
@@ -22,12 +22,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/xmidt-org/codex-db/blacklist"
 	"github.com/xmidt-org/codex-db"
+	"github.com/xmidt-org/codex-db/blacklist"
 
-	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
 )
 
 func TestRetryInsertRecords(t *testing.T) {