Merge pull request #71 from ripienaar/033

(misc) Release 0.3.3
choria-io · Jun 16, 2020 · b7fe8b7 · b7fe8b7
2 parents d5bd584 + 6fb3873
commit b7fe8b7
Show file tree

Hide file tree

Showing 5 changed files with 134 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
-|2010/01/06|      |Release 0.3.2                                         
+|2020/06/16|      |Release 0.3.3                                                                                            |
+|2020/06/16|      |Update dependencies for `certmanager` support                                                            |
+|2020/01/06|      |Release 0.3.2                                                                                            |
 |2020/01/01|68    |Use common component for managing Rego evaluation                                                        |
 |2019/12/29|66    |Support tracing Rego evaluation when in debug mode                                                       |
 |2019/12/22|      |Release 0.3.1                                                                                            |

diff --git a/auditors/natsstream/natsstream.go b/auditors/natsstream/natsstream.go
@@ -114,7 +114,7 @@ func (ns *NatsStream) connect() (err error) {
 			}))
 			if err != nil {
 				ns.log.Errorf("Could not create initial STAN connection, retrying: %s", err)
-				backoff.FiveSec.InterruptableSleep(ctx, ctr) // skipcq: GSC-G104
+				backoff.FiveSec.TrySleep(ctx, ctr)
 
 				continue
 			}
@@ -150,7 +150,7 @@ func (ns *NatsStream) connect() (err error) {
 
 				ns.log.WithField("attempt", ctr).Infof("Attempting to reconnect NATS Stream after reconnection")
 
-				backoff.FiveSec.InterruptableSleep(ctx, ctr) // skipcq: GSC-G104
+				backoff.FiveSec.TrySleep(ctx, ctr)
 
 				err := start()
 				if err != nil {

diff --git a/authorizers/opa/opa_test.go b/authorizers/opa/opa_test.go
@@ -51,7 +51,6 @@ var _ = Describe("Authorizers/OPA", func() {
 
 		for r := 1; r <= 5; r++ {
 			policy := readFixture(fmt.Sprintf("testdata/scenario%d.rego", r))
-			fmt.Println(fmt.Sprintf("testdata/scenario%d.rego", r))
 			claims = jwt.MapClaims(map[string]interface{}{
 				"opa_policy": policy,
 				"callerid":   "up=bob",

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/alecthomas/kingpin v2.2.6+incompatible
-	github.com/choria-io/go-choria v0.13.2-0.20200206160755-b26177d80f81
+	github.com/choria-io/go-choria v0.14.1-0.20200615121616-c91e315438c3
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-openapi/errors v0.19.3
 	github.com/go-openapi/loads v0.19.4
@@ -13,18 +13,18 @@ require (
 	github.com/go-openapi/strfmt v0.19.4
 	github.com/go-openapi/swag v0.19.6
 	github.com/go-yaml/yaml v2.1.0+incompatible // indirect
-	github.com/golang/mock v1.4.0
+	github.com/golang/mock v1.4.3
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/nats-io/stan.go v0.6.0
 	github.com/okta/okta-sdk-golang v0.1.0
-	github.com/onsi/ginkgo v1.11.0
-	github.com/onsi/gomega v1.8.1
-	github.com/open-policy-agent/opa v0.16.0
+	github.com/onsi/ginkgo v1.12.3
+	github.com/onsi/gomega v1.10.1
+	github.com/open-policy-agent/opa v0.20.5
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.4.0
-	github.com/sirupsen/logrus v1.4.2
-	github.com/tidwall/gjson v1.4.0
-	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
-	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
+	github.com/prometheus/client_golang v1.6.0
+	github.com/sirupsen/logrus v1.6.0
+	github.com/tidwall/gjson v1.6.0
+	golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
+	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
 )