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

allow superusers to have unmanaged passwords #70

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

allow superusers to have unmanaged passwords #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40e3ad9
allow superusers to have unmanaged passwords
mtesch-um Apr 22, 2022
9db9fc5
Update resource_redshift_user_test.go
mtesch-um Apr 22, 2022
99b796e
Update resource_redshift_user.go
mtesch-um Apr 22, 2022
2be9192
Update resource_redshift_user_test.go
mtesch-um Apr 22, 2022
918b319
Merge branch 'master' into patch-1
mtesch-um Jan 5, 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
12 changes: 0 additions & 12 deletions redshift/resource_redshift_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package redshift

import (
"context"
"crypto/md5"
"database/sql"
"fmt"
Expand Down Expand Up @@ -56,17 +55,6 @@ Amazon Redshift user accounts can only be created and dropped by a database supe
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
CustomizeDiff: func(_ context.Context, d *schema.ResourceDiff, p interface{}) error {
isSuperuser := d.Get(userSuperuserAttr).(bool)
isPasswordKnown := d.NewValueKnown(userPasswordAttr)

password, hasPassword := d.GetOk(userPasswordAttr)
if isSuperuser && isPasswordKnown && (!hasPassword || password.(string) == "") {
return fmt.Errorf("Users that are superusers must define a password.")
}

return nil
},

Schema: map[string]*schema.Schema{
userNameAttr: {
Expand Down
23 changes: 0 additions & 23 deletions redshift/resource_redshift_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"database/sql"
"fmt"
"os"
"regexp"
"strconv"
"strings"
"testing"
Expand Down Expand Up @@ -191,28 +190,6 @@ resource "redshift_user" "update_superuser" {
})
}

func TestAccRedshiftUser_SuperuserRequiresPassword(t *testing.T) {
userName := strings.ReplaceAll(acctest.RandomWithPrefix("tf_acc_superuser"), "-", "_")
config := fmt.Sprintf(`
resource "redshift_user" "superuser" {
name = %[1]q
superuser = true
}
`, userName)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckRedshiftUserDestroy,
Steps: []resource.TestStep{
{
Config: config,
ExpectError: regexp.MustCompile("Users that are superusers must define a password."),
},
},
})
}

func TestAccRedshiftUser_SuperuserFalseDoesntRequiresPassword(t *testing.T) {
userName := strings.ReplaceAll(acctest.RandomWithPrefix("tf_acc_superuser"), "-", "_")
config := fmt.Sprintf(`
Expand Down