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: add nill check for grant_helpers #1518

Merged
merged 9 commits into from
Feb 6, 2023
Merged

fix: add nill check for grant_helpers #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
01b8fc2
fix: multiple share grants
sfc-gh-swinkler Feb 2, 2023
a42033c
fix: multiple share grants
sfc-gh-swinkler Feb 2, 2023
bc8a401
fix: multiple share grants
sfc-gh-swinkler Feb 2, 2023
db1130e
fix: multiple share grants
sfc-gh-swinkler Feb 2, 2023
1604cc8
add nil check
sfc-gh-swinkler Feb 6, 2023
fe1787c
Merge branch 'main' into shares-fix
sfc-gh-swinkler Feb 6, 2023
66e0a14
add nil check
sfc-gh-swinkler Feb 6, 2023
1e3b0a9
Merge branch 'shares-fix' of https://github.com/Snowflake-Labs/terraf…
sfc-gh-swinkler Feb 6, 2023
b1f9748
add nil check
sfc-gh-swinkler Feb 6, 2023
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 pkg/resources/grant_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func readGenericGrant(
}

var existingRoles *schema.Set
if v, ok := d.GetOk("roles"); ok {
if v, ok := d.GetOk("roles"); ok && v != nil {
existingRoles = v.(*schema.Set)
}
multipleGrantFeatureFlag := d.Get("enable_multiple_grants").(bool)
Expand All @@ -287,7 +287,7 @@ func readGenericGrant(
}

var existingShares *schema.Set
if v, ok := d.GetOk("shares"); ok {
if v, ok := d.GetOk("shares"); ok && v != nil {
existingShares = v.(*schema.Set)
}
// Now see which shares have our privilege.
Expand Down
17 changes: 17 additions & 0 deletions pkg/resources/role_grants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/jmoiron/sqlx"
"github.com/snowflakedb/gosnowflake"
"golang.org/x/exp/slices"
)

func RoleGrants() *schema.Resource {
Expand Down Expand Up @@ -219,6 +220,22 @@ func DeleteRoleGrants(d *schema.ResourceData, meta interface{}) error {
func revokeRoleFromRole(db *sql.DB, role1, role2 string) error {
rg := snowflake.RoleGrant(role1).Role(role2)
err := snowflake.Exec(db, rg.Revoke())
if driverErr, ok := err.(*gosnowflake.SnowflakeError); ok { //nolint:errorlint // todo: should be fixed
if driverErr.Number == 2003 {
// handling error if a role has been deleted prior to revoking a role
// 002003 (02000): SQL compilation error:
// User 'XXX' does not exist or not authorized.
roles, _ := snowflake.ListRoles(db, role2)
roleNames := make([]string, len(roles))
for i, r := range roles {
roleNames[i] = r.Name.String
}
if !slices.Contains(roleNames, role2) {
log.Printf("[WARN] Role %s does not exist. No need to revoke role %s", role2, role1)
return nil
}
}
}
return err
}

Expand Down