Skip to content
This repository has been archived by the owner on Nov 14, 2020. It is now read-only.

grant/default privileges: Fix schema verification. #74

Merged
merged 1 commit into from
Apr 18, 2019
Merged

grant/default privileges: Fix schema verification. #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 postgresql/resource_postgresql_default_privileges_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestAccPostgresqlDefaultPrivileges(t *testing.T) {
database = "%s"
owner = "%s"
role = "%s"
schema = "public"
schema = "test_schema"
object_type = "table"
privileges = ["SELECT"]
}
Expand All @@ -43,7 +43,7 @@ func TestAccPostgresqlDefaultPrivileges(t *testing.T) {
Config: testDPSelect,
Check: resource.ComposeTestCheckFunc(
func(*terraform.State) error {
tables := []string{"test_table"}
tables := []string{"test_schema.test_table"}
// To test default privileges, we need to create a table
// after having apply the state.
dropFunc := createTestTables(t, dbSuffix, tables)
Expand Down
2 changes: 1 addition & 1 deletion postgresql/resource_postgresql_grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ func checkRoleDBSchemaExists(client *Client, d *schema.ResourceData) (bool, erro

// Check the schema exists (the SQL connection needs to be on the right database)
pgSchema := d.Get("schema").(string)
exists, err = schemaExists(txn, pgSchema)
exists, err = schemaExists(dbTxn, pgSchema)
if err != nil {
return false, err
}
Expand Down
33 changes: 22 additions & 11 deletions postgresql/resource_postgresql_grant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,25 @@ func TestAccPostgresqlGrant(t *testing.T) {
dbSuffix, teardown := setupTestDatabase(t, true, true)
defer teardown()

testTables := []string{"test_table", "test_table2"}
testTables := []string{"test_schema.test_table", "test_schema.test_table2"}
createTestTables(t, dbSuffix, testTables)

dbName, roleName := getTestDBNames(dbSuffix)
var testGrantSelect = fmt.Sprintf(`
resource "postgresql_grant" "test_ro" {
resource "postgresql_grant" "test" {
database = "%s"
role = "%s"
schema = "public"
schema = "test_schema"
object_type = "table"
privileges = ["SELECT"]
}
`, dbName, roleName)

var testGrantSelectInsertUpdate = fmt.Sprintf(`
resource "postgresql_grant" "test_ro" {
resource "postgresql_grant" "test" {
database = "%s"
role = "%s"
schema = "public"
schema = "test_schema"
object_type = "table"
privileges = ["SELECT", "INSERT", "UPDATE"]
}
Expand All @@ -51,8 +51,8 @@ func TestAccPostgresqlGrant(t *testing.T) {
{
Config: testGrantSelect,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("postgresql_grant.test_ro", "privileges.#", "1"),
resource.TestCheckResourceAttr("postgresql_grant.test_ro", "privileges.3138006342", "SELECT"),
resource.TestCheckResourceAttr("postgresql_grant.test", "privileges.#", "1"),
resource.TestCheckResourceAttr("postgresql_grant.test", "privileges.3138006342", "SELECT"),
func(*terraform.State) error {
return testCheckTablesPrivileges(t, dbSuffix, testTables, []string{"SELECT"})
},
Expand All @@ -61,15 +61,26 @@ func TestAccPostgresqlGrant(t *testing.T) {
{
Config: testGrantSelectInsertUpdate,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("postgresql_grant.test_ro", "privileges.#", "3"),
resource.TestCheckResourceAttr("postgresql_grant.test_ro", "privileges.3138006342", "SELECT"),
resource.TestCheckResourceAttr("postgresql_grant.test_ro", "privileges.892623219", "INSERT"),
resource.TestCheckResourceAttr("postgresql_grant.test_ro", "privileges.1759376126", "UPDATE"),
resource.TestCheckResourceAttr("postgresql_grant.test", "privileges.#", "3"),
resource.TestCheckResourceAttr("postgresql_grant.test", "privileges.3138006342", "SELECT"),
resource.TestCheckResourceAttr("postgresql_grant.test", "privileges.892623219", "INSERT"),
resource.TestCheckResourceAttr("postgresql_grant.test", "privileges.1759376126", "UPDATE"),
func(*terraform.State) error {
return testCheckTablesPrivileges(t, dbSuffix, testTables, []string{"SELECT", "INSERT", "UPDATE"})
},
),
},
// Finally reapply the first step to be sure that extra privileges are correctly granted.
{
Config: testGrantSelect,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("postgresql_grant.test", "privileges.#", "1"),
resource.TestCheckResourceAttr("postgresql_grant.test", "privileges.3138006342", "SELECT"),
func(*terraform.State) error {
return testCheckTablesPrivileges(t, dbSuffix, testTables, []string{"SELECT"})
},
),
},
},
})
}
10 changes: 7 additions & 3 deletions postgresql/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,20 @@ func setupTestDatabase(t *testing.T, createDB, createRole bool) (string, func())

dbName, roleName := getTestDBNames(suffix)

if createDB {
dbExecute(t, config.connStr("postgres"), fmt.Sprintf("CREATE DATABASE %s", dbName))
}
if createRole {
dbExecute(t, config.connStr("postgres"), fmt.Sprintf(
"CREATE ROLE %s LOGIN ENCRYPTED PASSWORD '%s'",
roleName, testRolePassword,
))
}

if createDB {
dbExecute(t, config.connStr("postgres"), fmt.Sprintf("CREATE DATABASE %s", dbName))
// Create a test schema in this new database and grant usage to rolName
dbExecute(t, config.connStr(dbName), "CREATE SCHEMA test_schema")
dbExecute(t, config.connStr(dbName), fmt.Sprintf("GRANT usage ON SCHEMA test_schema to %s", roleName))
}

return suffix, func() {
dbExecute(t, config.connStr("postgres"), fmt.Sprintf("DROP DATABASE IF EXISTS %s", dbName))
dbExecute(t, config.connStr("postgres"), fmt.Sprintf("DROP ROLE IF EXISTS %s", roleName))
Expand Down