TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-14 02:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Merge branch 'main' into org_api

Browse Source
This commit is contained in:
Iraq Jaber
2025-05-20 14:11:40 +02:00
parent 1fde70ff7c
commit 733b0852d5
1 changed files with 93 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

241
internal/api/grpc/org/v2beta/integration_test/org_test.go
View File

@@ -59,7 +59,7 @@ func TestServer_CreateOrganization(t *testing.T) {
}{ }{
{ {
name: "missing permission", name: "missing permission",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeOrgOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
req: &v2beta_org.CreateOrganizationRequest{ req: &v2beta_org.CreateOrganizationRequest{
Name: "name", Name: "name",
Admins: nil, Admins: nil,
@@ -209,7 +209,7 @@ func TestServer_UpdateOrganization(t *testing.T) {
}{ }{
{ {
name: "update org with new name", name: "update org with new name",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.UpdateOrganizationRequest{ req: &v2beta_org.UpdateOrganizationRequest{
Id: orgId, Id: orgId,
Name: "new org name", Name: "new org name",
@@ -217,7 +217,7 @@ func TestServer_UpdateOrganization(t *testing.T) {
}, },
{ {
name: "update org with same name", name: "update org with same name",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.UpdateOrganizationRequest{ req: &v2beta_org.UpdateOrganizationRequest{
Id: orgId, Id: orgId,
Name: orgName, Name: orgName,
@@ -225,7 +225,7 @@ func TestServer_UpdateOrganization(t *testing.T) {
}, },
{ {
name: "update org with non existent org id", name: "update org with non existent org id",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.UpdateOrganizationRequest{ req: &v2beta_org.UpdateOrganizationRequest{
Id: "non existant org id", Id: "non existant org id",
// Name: "", // Name: "",
@@ -234,7 +234,7 @@ func TestServer_UpdateOrganization(t *testing.T) {
}, },
{ {
name: "update org with no id", name: "update org with no id",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.UpdateOrganizationRequest{ req: &v2beta_org.UpdateOrganizationRequest{
Id: "", Id: "",
Name: orgName, Name: orgName,
@@ -260,10 +260,9 @@ func TestServer_UpdateOrganization(t *testing.T) {
} }
func TestServer_ListOrganization(t *testing.T) { func TestServer_ListOrganization(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute) testStartTimestamp := time.Now()
defer cancel() ListOrgIinstance := integration.NewInstance(CTX)
ListOrgIinstance := integration.NewInstance(ctx) listOrgIAmOwnerCtx := ListOrgIinstance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
listOrgIAmOwnerCtx := ListOrgIinstance.WithAuthorization(ctx, integration.UserTypeIAMOwner)
listOrgClient := ListOrgIinstance.Client.OrgV2beta listOrgClient := ListOrgIinstance.Client.OrgV2beta
noOfOrgs := 3 noOfOrgs := 3
@@ -288,7 +287,7 @@ func TestServer_ListOrganization(t *testing.T) {
}{ }{
{ {
name: "list organizations happy path, no filter", name: "list organizations happy path, no filter",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
want: []*v2beta_org.Organization{ want: []*v2beta_org.Organization{
{ {
// default org // default org
@@ -310,7 +309,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations by id happy path", name: "list organizations by id happy path",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{ Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{
@@ -329,7 +328,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations by state active", name: "list organizations by state active",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_StateFilter{ Filter: &v2beta_org.OrganizationSearchFilter_StateFilter{
@@ -356,7 +355,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations by state inactive", name: "list organizations by state inactive",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_StateFilter{ Filter: &v2beta_org.OrganizationSearchFilter_StateFilter{
@@ -375,7 +374,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations by id bad id", name: "list organizations by id bad id",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{ Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{
@@ -388,7 +387,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations specify org name equals", name: "list organizations specify org name equals",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_NameFilter{ Filter: &v2beta_org.OrganizationSearchFilter_NameFilter{
@@ -408,7 +407,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations specify org name contains", name: "list organizations specify org name contains",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_NameFilter{ Filter: &v2beta_org.OrganizationSearchFilter_NameFilter{
@@ -430,7 +429,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations specify org name contains IGNORE CASE", name: "list organizations specify org name contains IGNORE CASE",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_NameFilter{ Filter: &v2beta_org.OrganizationSearchFilter_NameFilter{
@@ -452,7 +451,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations specify domain name equals", name: "list organizations specify domain name equals",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &org.OrganizationSearchFilter_DomainFilter{ Filter: &org.OrganizationSearchFilter_DomainFilter{
@@ -487,7 +486,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations specify domain name contains", name: "list organizations specify domain name contains",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &org.OrganizationSearchFilter_DomainFilter{ Filter: &org.OrganizationSearchFilter_DomainFilter{
@@ -510,7 +509,7 @@ func TestServer_ListOrganization(t *testing.T) {
}, },
{ {
name: "list organizations specify org name contains IGNORE CASE", name: "list organizations specify org name contains IGNORE CASE",
ctx: ListOrgIinstance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: listOrgIAmOwnerCtx,
query: []*v2beta_org.OrganizationSearchFilter{ query: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &org.OrganizationSearchFilter_DomainFilter{ Filter: &org.OrganizationSearchFilter_DomainFilter{
@@ -534,19 +533,18 @@ func TestServer_ListOrganization(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(context.Background(), 10*time.Minute) retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, 10*time.Minute)
require.EventuallyWithT(t, func(ttt *assert.CollectT) { require.EventuallyWithT(t, func(ttt *assert.CollectT) {
got, err := listOrgClient.ListOrganizations(tt.ctx, &v2beta_org.ListOrganizationsRequest{ got, err := listOrgClient.ListOrganizations(tt.ctx, &v2beta_org.ListOrganizationsRequest{
Filter: tt.query, Filter: tt.query,
}) })
if tt.wantErr { if tt.wantErr {
require.Error(t, err) assert.Error(ttt, err)
return
} }
require.NoError(t, err) require.NoError(ttt, err)
require.Equal(t, uint64(len(tt.want)), got.Pagination.GetTotalResult()) require.Equal(ttt, uint64(len(tt.want)), got.Pagination.GetTotalResult())
foundOrgs := 0 foundOrgs := 0
for _, got := range got.Organizations { for _, got := range got.Organizations {
@@ -555,9 +553,9 @@ func TestServer_ListOrganization(t *testing.T) {
// created/chagned date // created/chagned date
gotCD := got.GetCreationDate().AsTime() gotCD := got.GetCreationDate().AsTime()
now := time.Now() now := time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) assert.WithinRange(ttt, gotCD, testStartTimestamp, now.Add(time.Minute))
gotCD = got.GetChangedDate().AsTime() gotCD = got.GetChangedDate().AsTime()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) assert.WithinRange(ttt, gotCD, testStartTimestamp, now.Add(time.Minute))
// default org // default org
if org.Name == got.Name && got.Name == "testinstance" { if org.Name == got.Name && got.Name == "testinstance" {
@@ -571,7 +569,7 @@ func TestServer_ListOrganization(t *testing.T) {
} }
} }
} }
require.Equal(t, len(tt.want), foundOrgs) require.Equal(ttt, len(tt.want), foundOrgs)
}, retryDuration, tick, "timeout waiting for expected organizations being created") }, retryDuration, tick, "timeout waiting for expected organizations being created")
}) })
} }
@@ -589,7 +587,7 @@ func TestServer_DeleteOrganization(t *testing.T) {
}{ }{
{ {
name: "delete org happy path", name: "delete org happy path",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
createOrgFunc: func() string { createOrgFunc: func() string {
orgs, _, err := createOrgs(CTX, Client, 1) orgs, _, err := createOrgs(CTX, Client, 1)
if err != nil { if err != nil {
@@ -602,7 +600,7 @@ func TestServer_DeleteOrganization(t *testing.T) {
}, },
{ {
name: "delete already deleted org", name: "delete already deleted org",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
createOrgFunc: func() string { createOrgFunc: func() string {
orgs, _, err := createOrgs(CTX, Client, 1) orgs, _, err := createOrgs(CTX, Client, 1)
if err != nil { if err != nil {
@@ -620,7 +618,7 @@ func TestServer_DeleteOrganization(t *testing.T) {
}, },
{ {
name: "delete non existent org", name: "delete non existent org",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.DeleteOrganizationRequest{ req: &v2beta_org.DeleteOrganizationRequest{
Id: "non existent org id", Id: "non existent org id",
}, },
@@ -646,26 +644,12 @@ func TestServer_DeleteOrganization(t *testing.T) {
now := time.Now() now := time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
} }
listOrgRes, err := Client.ListOrganizations(tt.ctx, &v2beta_org.ListOrganizationsRequest{
Filter: []*v2beta_org.OrganizationSearchFilter{
{
Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{
IdFilter: &v2beta_org.OrgIDFilter{
Id: tt.req.Id,
},
},
},
},
})
require.NoError(t, err)
require.Nil(t, listOrgRes.Organizations)
}) })
} }
} }
func TestServer_DeactivateReactivateNonExistentOrganization(t *testing.T) { func TestServer_DeactivateReactivateNonExistentOrganization(t *testing.T) {
ctx := Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner) ctx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
// deactivate non existent organization // deactivate non existent organization
_, err := Client.DeactivateOrganization(ctx, &v2beta_org.DeactivateOrganizationRequest{ _, err := Client.DeactivateOrganization(ctx, &v2beta_org.DeactivateOrganizationRequest{
@@ -695,25 +679,9 @@ func TestServer_DeactivateReactivateOrganization(t *testing.T) {
return return
} }
orgId := orgs[0].Id orgId := orgs[0].Id
ctx := Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner)
// 2. check inital state of organization // 2. deactivate organization once
listOrgRes, err := Client.ListOrganizations(ctx, &v2beta_org.ListOrganizationsRequest{ deactivate_res, err := Client.DeactivateOrganization(CTX, &v2beta_org.DeactivateOrganizationRequest{
Filter: []*v2beta_org.OrganizationSearchFilter{
{
Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{
IdFilter: &v2beta_org.OrgIDFilter{
Id: orgId,
},
},
},
},
})
require.NoError(t, err)
require.Equal(t, v2beta_org.OrgState_ORG_STATE_ACTIVE, listOrgRes.Organizations[0].State)
// 3. deactivate organization once
deactivate_res, err := Client.DeactivateOrganization(ctx, &v2beta_org.DeactivateOrganizationRequest{
Id: orgId, Id: orgId,
}) })
require.NoError(t, err) require.NoError(t, err)
@@ -721,8 +689,8 @@ func TestServer_DeactivateReactivateOrganization(t *testing.T) {
now := time.Now() now := time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
// 4. check organization state is deactivated // 3. check organization state is deactivated
listOrgRes, err = Client.ListOrganizations(ctx, &v2beta_org.ListOrganizationsRequest{ listOrgRes, err := Client.ListOrganizations(CTX, &v2beta_org.ListOrganizationsRequest{
Filter: []*v2beta_org.OrganizationSearchFilter{ Filter: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{ Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{
@@ -736,15 +704,15 @@ func TestServer_DeactivateReactivateOrganization(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, v2beta_org.OrgState_ORG_STATE_INACTIVE, listOrgRes.Organizations[0].State) require.Equal(t, v2beta_org.OrgState_ORG_STATE_INACTIVE, listOrgRes.Organizations[0].State)
// 5. repeat deactivate organization once // 4. repeat deactivate organization once
_, err = Client.DeactivateOrganization(ctx, &v2beta_org.DeactivateOrganizationRequest{ _, err = Client.DeactivateOrganization(CTX, &v2beta_org.DeactivateOrganizationRequest{
Id: orgId, Id: orgId,
}) })
// TODO this error message needs to be reoved // TODO this error message needs to be reoved
require.Contains(t, err.Error(), "Organisation is already deactivated") require.Contains(t, err.Error(), "Organisation is already deactivated")
// 6. repeat check organization state is still deactivated // 5. repeat check organization state is still deactivated
listOrgRes, err = Client.ListOrganizations(ctx, &v2beta_org.ListOrganizationsRequest{ listOrgRes, err = Client.ListOrganizations(CTX, &v2beta_org.ListOrganizationsRequest{
Filter: []*v2beta_org.OrganizationSearchFilter{ Filter: []*v2beta_org.OrganizationSearchFilter{
{ {
Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{ Filter: &v2beta_org.OrganizationSearchFilter_IdFilter{
@@ -769,7 +737,7 @@ func TestServer_DeactivateReactivateOrganization(t *testing.T) {
return return
} }
orgId := orgs[0].Id orgId := orgs[0].Id
ctx := Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner) ctx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
// 2. check inital state of organization // 2. check inital state of organization
listOrgRes, err := Client.ListOrganizations(ctx, &v2beta_org.ListOrganizationsRequest{ listOrgRes, err := Client.ListOrganizations(ctx, &v2beta_org.ListOrganizationsRequest{
@@ -882,11 +850,11 @@ func TestServer_AddListDeletOerganizationDomain(t *testing.T) {
return return
} }
orgId := orgs[0].Id orgId := orgs[0].Id
ctx := Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner) // ctx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
domain := "www.domain.com" domain := "www.domain.com"
// 2. add domain // 2. add domain
addOrgDomainRes, err := Client.AddOrganizationDomain(ctx, &v2beta_org.AddOrganizationDomainRequest{ addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: domain, Domain: domain,
}) })
@@ -896,21 +864,8 @@ func TestServer_AddListDeletOerganizationDomain(t *testing.T) {
now := time.Now() now := time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
// 2. check domain is added
queryRes, err := Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{
OrganizationId: orgId,
})
require.NoError(t, err)
found := false
for _, res := range queryRes.Domains {
if res.DomainName == domain {
found = true
}
}
require.True(t, found, "unable to find added domain")
// 3. re-add domain // 3. re-add domain
_, err = Client.AddOrganizationDomain(ctx, &v2beta_org.AddOrganizationDomainRequest{ _, err = Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: domain, Domain: domain,
}) })
@@ -923,11 +878,11 @@ func TestServer_AddListDeletOerganizationDomain(t *testing.T) {
// assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) // assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
// 4. check domain is added // 4. check domain is added
queryRes, err = Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{ queryRes, err := Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{
OrganizationId: orgId, OrganizationId: orgId,
}) })
require.NoError(t, err) require.NoError(t, err)
found = false found := false
for _, res := range queryRes.Domains { for _, res := range queryRes.Domains {
if res.DomainName == domain { if res.DomainName == domain {
found = true found = true
@@ -946,11 +901,10 @@ func TestServer_AddListDeletOerganizationDomain(t *testing.T) {
return return
} }
orgId := orgs[0].Id orgId := orgs[0].Id
ctx := Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner)
domain := "www.domain2.com" domain := "www.domain2.com"
// 2. add domain // 2. add domain
addOrgDomainRes, err := Client.AddOrganizationDomain(ctx, &v2beta_org.AddOrganizationDomainRequest{ addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: domain, Domain: domain,
}) })
@@ -960,7 +914,18 @@ func TestServer_AddListDeletOerganizationDomain(t *testing.T) {
now := time.Now() now := time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
// 2. check domain is added // 2. delete organisation domain
deleteOrgDomainRes, err := Client.DeleteOrganizationDomain(CTX, &v2beta_org.DeleteOrganizationDomainRequest{
OrganizationId: orgId,
Domain: domain,
})
require.NoError(t, err)
// check details
gotCD = deleteOrgDomainRes.GetDeletionDate().AsTime()
now = time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
// 3. check organization domain deleted
queryRes, err := Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{ queryRes, err := Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{
OrganizationId: orgId, OrganizationId: orgId,
}) })
@@ -971,34 +936,10 @@ func TestServer_AddListDeletOerganizationDomain(t *testing.T) {
found = true found = true
} }
} }
require.True(t, found, "unable to find added domain")
// 3. delete organisation domain
deleteOrgDomainRes, err := Client.DeleteOrganizationDomain(ctx, &v2beta_org.DeleteOrganizationDomainRequest{
OrganizationId: orgId,
Domain: domain,
})
require.NoError(t, err)
// check details
gotCD = deleteOrgDomainRes.GetDeletionDate().AsTime()
now = time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
// 4. check organization domain deleted
queryRes, err = Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{
OrganizationId: orgId,
})
require.NoError(t, err)
found = false
for _, res := range queryRes.Domains {
if res.DomainName == domain {
found = true
}
}
require.False(t, found, "deleted domain found") require.False(t, found, "deleted domain found")
// 5. redelete organisation domain // 4. redelete organisation domain
_, err = Client.DeleteOrganizationDomain(ctx, &v2beta_org.DeleteOrganizationDomainRequest{ _, err = Client.DeleteOrganizationDomain(CTX, &v2beta_org.DeleteOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: domain, Domain: domain,
}) })
@@ -1010,7 +951,7 @@ func TestServer_AddListDeletOerganizationDomain(t *testing.T) {
// now = time.Now() // now = time.Now()
// assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) // assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
// 6. check organization domain deleted // 5. check organization domain deleted
queryRes, err = Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{ queryRes, err = Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{
OrganizationId: orgId, OrganizationId: orgId,
}) })
@@ -1063,7 +1004,7 @@ func TestServer_ValidateOrganizationDomain(t *testing.T) {
}{ }{
{ {
name: "validate org http happy path", name: "validate org http happy path",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.GenerateOrganizationDomainValidationRequest{ req: &v2beta_org.GenerateOrganizationDomainValidationRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: domain, Domain: domain,
@@ -1072,7 +1013,7 @@ func TestServer_ValidateOrganizationDomain(t *testing.T) {
}, },
{ {
name: "validate org http non existnetn org id", name: "validate org http non existnetn org id",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.GenerateOrganizationDomainValidationRequest{ req: &v2beta_org.GenerateOrganizationDomainValidationRequest{
OrganizationId: "non existent org id", OrganizationId: "non existent org id",
Domain: domain, Domain: domain,
@@ -1083,7 +1024,7 @@ func TestServer_ValidateOrganizationDomain(t *testing.T) {
}, },
{ {
name: "validate org dns happy path", name: "validate org dns happy path",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.GenerateOrganizationDomainValidationRequest{ req: &v2beta_org.GenerateOrganizationDomainValidationRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: domain, Domain: domain,
@@ -1092,7 +1033,7 @@ func TestServer_ValidateOrganizationDomain(t *testing.T) {
}, },
{ {
name: "validate org dns non existnetn org id", name: "validate org dns non existnetn org id",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.GenerateOrganizationDomainValidationRequest{ req: &v2beta_org.GenerateOrganizationDomainValidationRequest{
OrganizationId: "non existent org id", OrganizationId: "non existent org id",
Domain: domain, Domain: domain,
@@ -1103,7 +1044,7 @@ func TestServer_ValidateOrganizationDomain(t *testing.T) {
}, },
{ {
name: "validate org non existnetn domain", name: "validate org non existnetn domain",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
req: &v2beta_org.GenerateOrganizationDomainValidationRequest{ req: &v2beta_org.GenerateOrganizationDomainValidationRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: "non existent domain", Domain: "non existent domain",
@@ -1146,14 +1087,14 @@ func TestServer_SetOrganizationMetadata(t *testing.T) {
}{ }{
{ {
name: "set org metadata", name: "set org metadata",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
orgId: orgId, orgId: orgId,
key: "key1", key: "key1",
value: "value1", value: "value1",
}, },
{ {
name: "set org metadata on non existant org", name: "set org metadata on non existant org",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
orgId: "non existant orgid", orgId: "non existant orgid",
key: "key2", key: "key2",
value: "value2", value: "value2",
@@ -1161,7 +1102,7 @@ func TestServer_SetOrganizationMetadata(t *testing.T) {
}, },
{ {
name: "update org metadata", name: "update org metadata",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1180,7 +1121,7 @@ func TestServer_SetOrganizationMetadata(t *testing.T) {
}, },
{ {
name: "update org metadata with same value", name: "update org metadata with same value",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1265,7 +1206,7 @@ func TestServer_ListOrganizationMetadata(t *testing.T) {
}{ }{
{ {
name: "list org metadata happy path", name: "list org metadata happy path",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1288,7 +1229,7 @@ func TestServer_ListOrganizationMetadata(t *testing.T) {
}, },
{ {
name: "list multiple org metadata happy path", name: "list multiple org metadata happy path",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1327,7 +1268,7 @@ func TestServer_ListOrganizationMetadata(t *testing.T) {
}, },
{ {
name: "list org metadata for non existent org", name: "list org metadata for non existent org",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
orgId: "non existent orgid", orgId: "non existent orgid",
keyValuPars: []struct{ key, value string }{}, keyValuPars: []struct{ key, value string }{},
}, },
@@ -1337,21 +1278,25 @@ func TestServer_ListOrganizationMetadata(t *testing.T) {
if tt.setupFunc != nil { if tt.setupFunc != nil {
tt.setupFunc() tt.setupFunc()
} }
got, err := Client.ListOrganizationMetadata(tt.ctx, &v2beta_org.ListOrganizationMetadataRequest{
OrganizationId: tt.orgId,
})
require.NoError(t, err)
foundMetadataCount := 0 retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, 10*time.Minute)
for _, kv := range tt.keyValuPars { require.EventuallyWithT(t, func(ttt *assert.CollectT) {
for _, res := range got.Metadata { got, err := Client.ListOrganizationMetadata(tt.ctx, &v2beta_org.ListOrganizationMetadataRequest{
if res.Key == kv.key && OrganizationId: tt.orgId,
string(res.Value) == kv.value { })
foundMetadataCount += 1 require.NoError(t, err)
foundMetadataCount := 0
for _, kv := range tt.keyValuPars {
for _, res := range got.Metadata {
if res.Key == kv.key &&
string(res.Value) == kv.value {
foundMetadataCount += 1
}
} }
} }
} require.Equal(t, len(tt.keyValuPars), foundMetadataCount)
require.Equal(t, len(tt.keyValuPars), foundMetadataCount) }, retryDuration, tick, "timeout waiting for expected organizations being created")
}) })
} }
} }
@@ -1381,7 +1326,7 @@ func TestServer_DeleteOrganizationMetadata(t *testing.T) {
}{ }{
{ {
name: "delete org metadata happy path", name: "delete org metadata happy path",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1404,7 +1349,7 @@ func TestServer_DeleteOrganizationMetadata(t *testing.T) {
}, },
{ {
name: "delete multiple org metadata happy path", name: "delete multiple org metadata happy path",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1435,7 +1380,7 @@ func TestServer_DeleteOrganizationMetadata(t *testing.T) {
}, },
{ {
name: "delete some org metadata but not all", name: "delete some org metadata but not all",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1477,7 +1422,7 @@ func TestServer_DeleteOrganizationMetadata(t *testing.T) {
}, },
{ {
name: "delete org metadata that does not exist", name: "delete org metadata that does not exist",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1500,7 +1445,7 @@ func TestServer_DeleteOrganizationMetadata(t *testing.T) {
}, },
{ {
name: "delete org metadata for org that does not exist", name: "delete org metadata for org that does not exist",
ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeIAMOwner), ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner),
setupFunc: func() { setupFunc: func() {
_, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{ _, err := Client.SetOrganizationMetadata(CTX, &v2beta_org.SetOrganizationMetadataRequest{
OrganizationId: orgId, OrganizationId: orgId,