Skip to content

zms lib update #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RuiGuo34 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

zms lib update #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
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
gopkg.in/natefinch/lumberjack.v2 v2.0.0
k8s.io/api v0.19.0
k8s.io/apimachinery v0.19.0
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ func getFakeDomain() zms.SignedDomain {
},
Services: []*zms.ServiceIdentity{},
Entities: []*zms.Entity{},
Groups: []*zms.Group{},
},
KeyId: "colo-env-1.1",
Signature: "signature",
Expand Down
3 changes: 2 additions & 1 deletion pkg/cron/cron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,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)
}
Expand Down