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

feat: Added Missing Grant Updates + Removed ForceNew #1228

Merged
merged 2 commits into from
Sep 29, 2022
Merged

feat: Added Missing Grant Updates + Removed ForceNew #1228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
555490c
feat: Add Missing Grant Updates + Removed ForceNew
ChrisIsidora Sep 21, 2022
7807218
Added Missing Update Function
ChrisIsidora Sep 27, 2022
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
3 changes: 1 addition & 2 deletions pkg/resources/database_grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/pkg/errors"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/pkg/errors"
)

var validDatabasePrivileges = NewPrivilegeSet(
Expand Down Expand Up @@ -36,7 +36,6 @@ var databaseGrantSchema = map[string]*schema.Schema{
Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
ForceNew: true,
Description: "Grants privilege to these roles.",
},
"shares": {
Expand Down
56 changes: 54 additions & 2 deletions pkg/resources/external_table_grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,12 @@ var externalTableGrantSchema = map[string]*schema.Schema{
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
Description: "Grants privilege to these roles.",
ForceNew: true,
},
"shares": {
Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
Description: "Grants privilege to these shares (only valid if on_future is false).",
ForceNew: true,
},
"on_future": {
Type: schema.TypeBool,
Expand Down Expand Up @@ -84,6 +82,7 @@ func ExternalTableGrant() *TerraformGrantResource {
Create: CreateExternalTableGrant,
Read: ReadExternalTableGrant,
Delete: DeleteExternalTableGrant,
Update: UpdateExternalTableGrant,

Schema: externalTableGrantSchema,
Importer: &schema.ResourceImporter{
Expand Down Expand Up @@ -216,3 +215,56 @@ func DeleteExternalTableGrant(d *schema.ResourceData, meta interface{}) error {
}
return deleteGenericGrant(d, meta, builder)
}

// UpdateExternalTableGrant implements schema.UpdateFunc
func UpdateExternalTableGrant(d *schema.ResourceData, meta interface{}) error {
// for now the only thing we can update are roles or shares
// if nothing changed, nothing to update and we're done
if !d.HasChanges("roles", "shares") {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since everything else is marked as forcenew, this code will actually never run. but at least it makes it clear what future work needs to be done

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sfc-gh-swinkler The ForceNew should be removed that's why the Update was implemented

return nil
}

rolesToAdd := []string{}
rolesToRevoke := []string{}
sharesToAdd := []string{}
sharesToRevoke := []string{}
if d.HasChange("roles") {
rolesToAdd, rolesToRevoke = changeDiff(d, "roles")
}
if d.HasChange("shares") {
sharesToAdd, sharesToRevoke = changeDiff(d, "shares")
}
grantID, err := grantIDFromString(d.Id())
if err != nil {
return err
}

dbName := grantID.ResourceName
schemaName := grantID.SchemaName
externalTableName := grantID.ObjectName
futureExternalTables := (externalTableName == "")

// create the builder
var builder snowflake.GrantBuilder
if futureExternalTables {
builder = snowflake.FutureExternalTableGrant(dbName, schemaName)
} else {
builder = snowflake.ExternalTableGrant(dbName, schemaName, externalTableName)
}

// first revoke
err = deleteGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, rolesToRevoke, sharesToRevoke)
if err != nil {
return err
}
// then add
err = createGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, grantID.GrantOption, rolesToAdd, sharesToAdd)
if err != nil {
return err
}

// Done, refresh state
return ReadExternalTableGrant(d, meta)
}
52 changes: 51 additions & 1 deletion pkg/resources/file_format_grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ var fileFormatGrantSchema = map[string]*schema.Schema{
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
Description: "Grants privilege to these roles.",
ForceNew: true,
},
"on_future": {
Type: schema.TypeBool,
Expand Down Expand Up @@ -76,6 +75,7 @@ func FileFormatGrant() *TerraformGrantResource {
Create: CreateFileFormatGrant,
Read: ReadFileFormatGrant,
Delete: DeleteFileFormatGrant,
Update: UpdateFileFormat,

Schema: fileFormatGrantSchema,
Importer: &schema.ResourceImporter{
Expand Down Expand Up @@ -205,3 +205,53 @@ func DeleteFileFormatGrant(d *schema.ResourceData, meta interface{}) error {
}
return deleteGenericGrant(d, meta, builder)
}

// UpdateFileFormatGrant implements schema.UpdateFunc
func UpdateFileFormatGrant(d *schema.ResourceData, meta interface{}) error {
// for now the only thing we can update are roles or shares
// if nothing changed, nothing to update and we're done
if !d.HasChanges("roles") {
return nil
}

rolesToAdd := []string{}
rolesToRevoke := []string{}

if d.HasChange("roles") {
rolesToAdd, rolesToRevoke = changeDiff(d, "roles")
}

grantID, err := grantIDFromString(d.Id())
if err != nil {
return err
}

dbName := grantID.ResourceName
schemaName := grantID.SchemaName
fileFormatName := grantID.ObjectName
futureFileFormats := (fileFormatName == "")

// create the builder
var builder snowflake.GrantBuilder
if futureFileFormats {
builder = snowflake.FutureFileFormatGrant(dbName, schemaName)
} else {
builder = snowflake.FileFormatGrant(dbName, schemaName, fileFormatName)
}

// first revoke
err = deleteGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, rolesToRevoke, []string{})
if err != nil {
return err
}
// then add
err = createGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, grantID.GrantOption, rolesToAdd, []string{})
if err != nil {
return err
}

// Done, refresh state
return ReadFileFormatGrant(d, meta)
}
62 changes: 60 additions & 2 deletions pkg/resources/function_grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,12 @@ var functionGrantSchema = map[string]*schema.Schema{
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
Description: "Grants privilege to these roles.",
ForceNew: true,
},
"shares": {
Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
Description: "Grants privilege to these shares (only valid if on_future is false).",
ForceNew: true,
},
"on_future": {
Type: schema.TypeBool,
Expand Down Expand Up @@ -111,6 +109,7 @@ func FunctionGrant() *TerraformGrantResource {
Create: CreateFunctionGrant,
Read: ReadFunctionGrant,
Delete: DeleteFunctionGrant,
Update: UpdateFunctionGrant,

Schema: functionGrantSchema,
Importer: &schema.ResourceImporter{
Expand Down Expand Up @@ -286,3 +285,62 @@ func DeleteFunctionGrant(d *schema.ResourceData, meta interface{}) error {
}
return deleteGenericGrant(d, meta, builder)
}

// UpdateFunctionGrant implements schema.UpdateFunc
func UpdateFunctionGrant(d *schema.ResourceData, meta interface{}) error {
// for now the only thing we can update are roles or shares
// if nothing changed, nothing to update and we're done
if !d.HasChanges("roles", "shares") {
return nil
}

rolesToAdd := []string{}
rolesToRevoke := []string{}
sharesToAdd := []string{}
sharesToRevoke := []string{}
if d.HasChange("roles") {
rolesToAdd, rolesToRevoke = changeDiff(d, "roles")
}
if d.HasChange("shares") {
sharesToAdd, sharesToRevoke = changeDiff(d, "shares")
}
grantID, err := grantIDFromString(d.Id())
if err != nil {
return err
}

dbName := grantID.ResourceName
schemaName := grantID.SchemaName
functionName := grantID.ObjectName
futureFunctions := (functionName == "")

// create the builder
var builder snowflake.GrantBuilder
if futureFunctions {
builder = snowflake.FutureFunctionGrant(dbName, schemaName)
} else {
functionSignatureMap, err := parseCallableObjectName(grantID.ObjectName)
if err != nil {
return err
}
functionName := functionSignatureMap["callableName"].(string)
argumentTypes := functionSignatureMap["argumentTypes"].([]string)
builder = snowflake.FunctionGrant(dbName, schemaName, functionName, argumentTypes)
}

// first revoke
err = deleteGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, rolesToRevoke, sharesToRevoke)
if err != nil {
return err
}
// then add
err = createGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, grantID.GrantOption, rolesToAdd, sharesToAdd)
if err != nil {
return err
}

// Done, refresh state
return ReadFunctionGrant(d, meta)
}
44 changes: 43 additions & 1 deletion pkg/resources/integration_grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ var integrationGrantSchema = map[string]*schema.Schema{
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
Description: "Grants privilege to these roles.",
ForceNew: true,
},
"with_grant_option": {
Type: schema.TypeBool,
Expand All @@ -55,6 +54,7 @@ func IntegrationGrant() *TerraformGrantResource {
Create: CreateIntegrationGrant,
Read: ReadIntegrationGrant,
Delete: DeleteIntegrationGrant,
Update: UpdateIntegrationGrant,

Schema: integrationGrantSchema,
Importer: &schema.ResourceImporter{
Expand Down Expand Up @@ -133,3 +133,45 @@ func DeleteIntegrationGrant(d *schema.ResourceData, meta interface{}) error {

return deleteGenericGrant(d, meta, builder)
}

// UpdateIntegrationGrant implements schema.UpdateFunc
func UpdateIntegrationGrant(d *schema.ResourceData, meta interface{}) error {
// for now the only thing we can update are roles or shares
// if nothing changed, nothing to update and we're done
if !d.HasChanges("roles") {
return nil
}

rolesToAdd := []string{}
rolesToRevoke := []string{}

if d.HasChange("roles") {
rolesToAdd, rolesToRevoke = changeDiff(d, "roles")
}

grantID, err := grantIDFromString(d.Id())
if err != nil {
return err
}

w := grantID.ResourceName

// create the builder
builder := snowflake.IntegrationGrant(w)

// first revoke
err = deleteGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, rolesToRevoke, []string{})
if err != nil {
return err
}
// then add
err = createGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, grantID.GrantOption, rolesToAdd, []string{})
if err != nil {
return err
}

// Done, refresh state
return ReadIntegrationGrant(d, meta)
}
46 changes: 45 additions & 1 deletion pkg/resources/masking_policy_grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ var maskingPolicyGrantSchema = map[string]*schema.Schema{
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
Description: "Grants privilege to these roles.",
ForceNew: true,
},
"schema_name": {
Type: schema.TypeString,
Expand Down Expand Up @@ -68,6 +67,7 @@ func MaskingPolicyGrant() *TerraformGrantResource {
Create: CreateMaskingPolicyGrant,
Read: ReadMaskingPolicyGrant,
Delete: DeleteMaskingPolicyGrant,
Update: UpdateMaskingPolicyGrant,

Schema: maskingPolicyGrantSchema,
Importer: &schema.ResourceImporter{
Expand Down Expand Up @@ -165,3 +165,47 @@ func DeleteMaskingPolicyGrant(d *schema.ResourceData, meta interface{}) error {

return deleteGenericGrant(d, meta, builder)
}

// UpdateMaskingPolicyGrant implements schema.UpdateFunc
func UpdateMaskingPolicyGrant(d *schema.ResourceData, meta interface{}) error {
// for now the only thing we can update are roles or shares
// if nothing changed, nothing to update and we're done
if !d.HasChanges("roles") {
return nil
}

rolesToAdd := []string{}
rolesToRevoke := []string{}

if d.HasChange("roles") {
rolesToAdd, rolesToRevoke = changeDiff(d, "roles")
}

grantID, err := grantIDFromString(d.Id())
if err != nil {
return err
}

dbName := grantID.ResourceName
schemaName := grantID.SchemaName
maskingPolicyName := grantID.ObjectName

// create the builder
builder := snowflake.MaskingPolicyGrant(dbName, schemaName, maskingPolicyName)

// first revoke
err = deleteGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, rolesToRevoke, []string{})
if err != nil {
return err
}
// then add
err = createGenericGrantRolesAndShares(
meta, builder, grantID.Privilege, grantID.GrantOption, rolesToAdd, []string{})
if err != nil {
return err
}

// Done, refresh state
return ReadMaskingPolicyGrant(d, meta)
}
Loading