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: schema_name is optional to enable future pipe grant #1424

Merged
merged 2 commits into from
Jan 10, 2023
Merged

fix: schema_name is optional to enable future pipe grant #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc4d75d
schema_name is optional to enable future pipe grant
bennylu2 Dec 19, 2022
c94765f
fmt
bennylu2 Dec 23, 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
2 changes: 1 addition & 1 deletion docs/resources/pipe_grant.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ resource "snowflake_pipe_grant" "grant" {
### Required

- `database_name` (String) The name of the database containing the current or future pipes on which to grant privileges.
- `schema_name` (String) The name of the schema containing the current or future pipes on which to grant privileges.

### Optional

Expand All @@ -41,6 +40,7 @@ resource "snowflake_pipe_grant" "grant" {
- `pipe_name` (String) The name of the pipe on which to grant privileges immediately (only valid if on_future is false).
- `privilege` (String) The privilege to grant on the current or future pipe.
- `roles` (Set of String) Grants privilege to these roles.
- `schema_name` (String) The name of the schema containing the current or future pipes on which to grant privileges.
- `with_grant_option` (Boolean) When this is set to true, allows the recipient role to grant the privileges to other roles.

### Read-Only
Expand Down
46 changes: 26 additions & 20 deletions pkg/resources/pipe_grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var pipeGrantSchema = map[string]*schema.Schema{
},
"schema_name": {
Type: schema.TypeString,
Required: true,
Optional: true,
Description: "The name of the schema containing the current or future pipes on which to grant privileges.",
ForceNew: true,
},
Expand Down Expand Up @@ -89,26 +89,33 @@ func PipeGrant() *TerraformGrantResource {

// CreatePipeGrant implements schema.CreateFunc.
func CreatePipeGrant(d *schema.ResourceData, meta interface{}) error {
var pipeName string
var (
pipeName string
schemaName string
)
if name, ok := d.GetOk("pipe_name"); ok {
pipeName = name.(string)
}
if name, ok := d.GetOk("schema_name"); ok {
schemaName = name.(string)
} else {
schemaName = ""
Copy link
Collaborator

Choose a reason for hiding this comment

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

FYI you don't need to set schemaName to an empty string. Since you already declared it on line 94, and the default value of a type string is an empty string.

}
dbName := d.Get("database_name").(string)
schemaName := d.Get("schema_name").(string)
priv := d.Get("privilege").(string)
futurePipes := d.Get("on_future").(bool)
onFuture := d.Get("on_future").(bool)
grantOption := d.Get("with_grant_option").(bool)
roles := expandStringList(d.Get("roles").(*schema.Set).List())

if (pipeName == "") && !futurePipes {
return errors.New("pipe_name must be set unless on_future is true")
if (schemaName == "") && !onFuture {
return errors.New("schema_name must be set unless on_future is true.")
}
if (pipeName != "") && futurePipes {
return errors.New("pipe_name must be empty if on_future is true")
if (pipeName == "") && !onFuture {
return errors.New("pipe_name must be set unless on_future is true.")
}

var builder snowflake.GrantBuilder
if futurePipes {
if onFuture {
builder = snowflake.FuturePipeGrant(dbName, schemaName)
} else {
builder = snowflake.PipeGrant(dbName, schemaName, pipeName)
Expand Down Expand Up @@ -152,14 +159,13 @@ func ReadPipeGrant(d *schema.ResourceData, meta interface{}) error {
if err := d.Set("schema_name", schemaName); err != nil {
return err
}
futurePipesEnabled := false
if pipeName == "" {
futurePipesEnabled = true
}

onFuture := (pipeName == "")

if err := d.Set("pipe_name", pipeName); err != nil {
return err
}
if err := d.Set("on_future", futurePipesEnabled); err != nil {
if err := d.Set("on_future", onFuture); err != nil {
return err
}
if err := d.Set("privilege", priv); err != nil {
Expand All @@ -170,13 +176,13 @@ func ReadPipeGrant(d *schema.ResourceData, meta interface{}) error {
}

var builder snowflake.GrantBuilder
if futurePipesEnabled {
if onFuture {
builder = snowflake.FuturePipeGrant(dbName, schemaName)
} else {
builder = snowflake.PipeGrant(dbName, schemaName, pipeName)
}

return readGenericGrant(d, meta, pipeGrantSchema, builder, futurePipesEnabled, validPipePrivileges)
return readGenericGrant(d, meta, pipeGrantSchema, builder, onFuture, validPipePrivileges)
}

// DeletePipeGrant implements schema.DeleteFunc.
Expand All @@ -189,10 +195,10 @@ func DeletePipeGrant(d *schema.ResourceData, meta interface{}) error {
schemaName := grantID.SchemaName
pipeName := grantID.ObjectName

futurePipes := (pipeName == "")
onFuture := (pipeName == "")

var builder snowflake.GrantBuilder
if futurePipes {
if onFuture {
builder = snowflake.FuturePipeGrant(dbName, schemaName)
} else {
builder = snowflake.PipeGrant(dbName, schemaName, pipeName)
Expand Down Expand Up @@ -223,11 +229,11 @@ func UpdatePipeGrant(d *schema.ResourceData, meta interface{}) error {
dbName := grantID.ResourceName
schemaName := grantID.SchemaName
pipeName := grantID.ObjectName
futurePipes := (pipeName == "")
onFuture := (pipeName == "")

// create the builder
var builder snowflake.GrantBuilder
if futurePipes {
if onFuture {
builder = snowflake.FuturePipeGrant(dbName, schemaName)
} else {
builder = snowflake.PipeGrant(dbName, schemaName, pipeName)
Expand Down