Skip to content
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

Jump to bottom

Add resource owner for zms put,get roles on e2e test #41

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Add resource owner for zms put,get roles on e2e test #41

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
6 changes: 4 additions & 2 deletions test/e2e/basic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ func TestBasicRoleUpdate(t *testing.T) {
role := zms.Role{
Name: roleResource,
}
err = f.ZMSClient.PutRole(domain, roleName, "", &role)
condition := false
_, err = f.ZMSClient.PutRole(domain, roleName, "", &condition, "", &role)
if err != nil {
log.Errorf("test 1 error adding regular role: %v", err)
t.Errorf("Unable to add role")
Expand Down Expand Up @@ -105,7 +106,8 @@ func TestTrustDomain(t *testing.T) {
Name: trustroleResource,
Trust: trustdomain,
}
err = f.ZMSClient.PutRole(domain, trustroleName, "", &trustRole)
condition := false
_, err = f.ZMSClient.PutRole(domain, trustroleName, "", &condition, "", &trustRole)
if err != nil {
log.Errorf("test 2 unable to add trust role: %v", err)
t.Error("Unable to add trust role")
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/framework/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,21 @@ func setup(stopCh <-chan struct{}) error {
}
config, err := clientcmd.BuildConfigFromFlags("", *kubeconfig)
if err != nil {
log.Errorf("error creating config: ", err)
log.Errorf("error creating config: %v", err)
return err
}

// set up k8s client
k8sclient, err := kubernetes.NewForConfig(config)
if err != nil {
log.Errorf("Failed to create k8s client: ", err)
log.Errorf("Failed to create k8s client: %v", err)
return err
}

// set up athenzdomains client
athenzClient, err := athenzClientset.NewForConfig(config)
if err != nil {
log.Errorf("Failed to create athenz domains client: ", err)
log.Errorf("Failed to create athenz domains client: %v", err)
return err
}
// set up cr informer to get athenzdomains resources
Expand All @@ -105,7 +105,7 @@ func setup(stopCh <-chan struct{}) error {
// set up zms client
zmsclient, err := setupZMSClient(*key, *cert, *zmsURL)
if err != nil {
log.Errorf("Failed to create zms client: ", err)
log.Errorf("Failed to create zms client: %v", err)
return err
}
adminDomain := ""
Expand Down Expand Up @@ -148,13 +148,13 @@ func teardown() error {
f := Global
domain := zms.DomainName(f.RoleDomain)
roleName := zms.EntityName(f.RoleName)
err := f.ZMSClient.DeleteRole(domain, roleName, "")
err := f.ZMSClient.DeleteRole(domain, roleName, "", "")
if err != nil {
log.Errorf("Unable to delete test1 role: %v", err)
return err
}
trustroleName := zms.EntityName(f.TrustRole)
err = f.ZMSClient.DeleteRole(domain, trustroleName, "")
err = f.ZMSClient.DeleteRole(domain, trustroleName, "", "")
if err != nil {
log.Errorf("Unable to delete test2 role: %v", err)
return err
Expand Down
Loading