Merge pull request #22 from yahoo/clientgo

zms lib update
AthenZ · Feb 1, 2021 · 8048d23 · 8048d23
2 parents bcd94fc + d358d02
commit 8048d23
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -17,13 +17,12 @@ require (
 	github.com/kr/pretty v0.2.0 // indirect
 	github.com/mash/go-accesslog v1.2.0
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/stretchr/testify v1.4.0
+	github.com/stretchr/testify v1.5.1
 	github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5
-	github.com/yahoo/athenz v1.8.40
+	github.com/yahoo/athenz v1.9.30
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
-	golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	k8s.io/api v0.15.10

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -294,7 +294,8 @@ func (c *Controller) sync(domain string) error {
 // zmsGetSignedDomains - make http request to zms API to fetch domain data
 func (c *Controller) zmsGetSignedDomains(domain string) (*zms.SignedDomains, bool, error) {
 	d := zms.DomainName(domain)
-	signedDomain, _, err := c.zmsClient.GetSignedDomains(d, "", "", "")
+	master := false
+	signedDomain, _, err := c.zmsClient.GetSignedDomains(d, "", "", &master, "")
 	if err != nil {
 		return nil, false, err
 	}

diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -112,6 +112,7 @@ func getFakeDomain() zms.SignedDomain {
 			},
 			Services: []*zms.ServiceIdentity{},
 			Entities: []*zms.Entity{},
+			Groups:   []*zms.Group{},
 		},
 		KeyId:     "colo-env-1.1",
 		Signature: "signature",

diff --git a/pkg/cron/cron.go b/pkg/cron/cron.go
@@ -94,7 +94,8 @@ func notifyOnErr(err error, backoffDelay time.Duration) {
 
 // RequestCall - ZMS call for update crons
 func (c *Cron) requestCall() error {
-	domains, etag, err := c.zmsClient.GetSignedDomains("", "true", "", c.etag)
+	master := false
+	domains, etag, err := c.zmsClient.GetSignedDomains("", "true", "", &master, c.etag)
 	if err != nil {
 		return fmt.Errorf("Error getting latest updated domains from ZMS API. Error: %v", err)
 	}