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

fix: Fix tests and relax warehouse validations #2959

Merged
merged 6 commits into from
Jul 26, 2024
Merged

fix: Fix tests and relax warehouse validations #2959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f0bdefe
unskip cortex test starts here
sfc-gh-asawicki Jul 23, 2024
10336bb
Fix application package integration tests
sfc-gh-asawicki Jul 24, 2024
f037657
Relax warehouse parameter validations
sfc-gh-asawicki Jul 25, 2024
1db07fe
Fix 4 more cortex and user tests
sfc-gh-asawicki Jul 25, 2024
d213b64
Fix test and after review
sfc-gh-asawicki Jul 26, 2024
23b11bc
Merge branch 'main' into unskip-cortex-test
sfc-gh-asawicki Jul 26, 2024
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
42 changes: 40 additions & 2 deletions pkg/sdk/testint/grants_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ func TestInt_GrantAndRevokePrivilegesToAccountRole(t *testing.T) {
t.Run("on all: cortex search service", func(t *testing.T) {
roleTest, roleCleanup := testClientHelper().Role.CreateRole(t)
t.Cleanup(roleCleanup)
table, tableTestCleanup := testClientHelper().Table.CreateTableWithPredefinedColumns(t)
t.Cleanup(tableTestCleanup)
cortex, cortexCleanup := testClientHelper().CortexSearchService.CreateCortexSearchService(t, table.ID())
t.Cleanup(cortexCleanup)

privileges := &sdk.AccountRoleGrantPrivileges{
SchemaObjectPrivileges: []sdk.SchemaObjectPrivilege{sdk.SchemaObjectPrivilegeUsage},
Expand All @@ -254,7 +258,31 @@ func TestInt_GrantAndRevokePrivilegesToAccountRole(t *testing.T) {
},
}
err := client.Grants.GrantPrivilegesToAccountRole(ctx, privileges, on, roleTest.ID(), nil)
require.ErrorContains(t, err, "unexpected 'SEARCH'")
require.NoError(t, err)

grants, err := client.Grants.Show(ctx, &sdk.ShowGrantOptions{
To: &sdk.ShowGrantsTo{
Role: roleTest.ID(),
},
})
require.NoError(t, err)
selectPrivilege, err := collections.FindOne[sdk.Grant](grants, func(g sdk.Grant) bool {
sfc-gh-jcieslak marked this conversation as resolved.
Show resolved Hide resolved
return g.Privilege == sdk.SchemaObjectPrivilegeUsage.String()
})
require.NoError(t, err)
assert.Equal(t, cortex.ID().FullyQualifiedName(), selectPrivilege.Name.FullyQualifiedName())
assert.Equal(t, sdk.ObjectTypeCortexSearchService, selectPrivilege.GrantedOn)

// now revoke and verify that the grant(s) are gone
err = client.Grants.RevokePrivilegesFromAccountRole(ctx, privileges, on, roleTest.ID(), nil)
require.NoError(t, err)
grants, err = client.Grants.Show(ctx, &sdk.ShowGrantOptions{
To: &sdk.ShowGrantsTo{
Role: roleTest.ID(),
},
})
require.NoError(t, err)
assert.Equal(t, 0, len(grants))
})

t.Run("on future schema object", func(t *testing.T) {
Expand Down Expand Up @@ -1117,6 +1145,10 @@ func TestInt_GrantOwnership(t *testing.T) {
return ownershipGrantOnObject(sdk.ObjectTypePipe, pipe.ID())
}

ownershipGrantOnCortexSearchService := func(cortexSearchService *sdk.CortexSearchService) sdk.OwnershipGrantOn {
return ownershipGrantOnObject(sdk.ObjectTypeCortexSearchService, cortexSearchService.ID())
}

ownershipGrantOnTask := func(task *sdk.Task) sdk.OwnershipGrantOn {
return ownershipGrantOnObject(sdk.ObjectTypeTask, task.ID())
}
Expand Down Expand Up @@ -1281,7 +1313,13 @@ func TestInt_GrantOwnership(t *testing.T) {
},
new(sdk.GrantOwnershipOptions),
)
require.ErrorContains(t, err, "Invalid object type 'CORTEX_SEARCH_SERVICE' for privilege 'OWNERSHIP'")
require.NoError(t, err)
checkOwnershipOnObjectToRole(t, ownershipGrantOnCortexSearchService(cortex), role.ID())

currentRole := testClientHelper().Context.CurrentRole(t)

grantOwnershipToRole(t, currentRole, ownershipGrantOnCortexSearchService(cortex), nil)
checkOwnershipOnObjectToRole(t, ownershipGrantOnCortexSearchService(cortex), currentRole)
})

t.Run("on pipe - with operate and monitor privileges granted", func(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/sdk/testint/users_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func TestInt_Users(t *testing.T) {
HasQueryTag("some_tag").
HasQuotedIdentifiersIgnoreCase(true).
HasRowsPerResultset(2).
HasS3StageVpceDnsName("vpce-some_dns-vpce.amazonaws.com").
HasS3StageVpceDnsName("vpce-id.s3.region.vpce.amazonaws.com").
HasSearchPath("$public, $current").
HasSimulatedDataSharingConsumer("some_consumer").
HasStatementQueuedTimeoutInSeconds(10).
Expand Down Expand Up @@ -485,7 +485,7 @@ func TestInt_Users(t *testing.T) {
QueryTag: sdk.String("some_tag"),
QuotedIdentifiersIgnoreCase: sdk.Bool(true),
RowsPerResultset: sdk.Int(2),
S3StageVpceDnsName: sdk.String("vpce-some_dns-vpce.amazonaws.com"),
S3StageVpceDnsName: sdk.String("vpce-id.s3.region.vpce.amazonaws.com"),
SearchPath: sdk.String("$public, $current"),
SimulatedDataSharingConsumer: sdk.String("some_consumer"),
StatementQueuedTimeoutInSeconds: sdk.Int(10),
Expand Down
Loading