From 949f81c5a719fd659d08938f8bd7db68ac0772b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lovro=20Ma=C5=BEgon?= Date: Wed, 4 Nov 2020 14:40:58 +0100 Subject: [PATCH] correctly save quoted role searchpath --- postgresql/resource_postgresql_role.go | 3 +++ postgresql/resource_postgresql_role_test.go | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/postgresql/resource_postgresql_role.go b/postgresql/resource_postgresql_role.go index ecb4a43d..20d5a083 100644 --- a/postgresql/resource_postgresql_role.go +++ b/postgresql/resource_postgresql_role.go @@ -473,6 +473,9 @@ func readSearchPath(roleConfig pq.ByteaArray) []string { config := string(v) if strings.HasPrefix(config, roleSearchPathAttr) { var result = strings.Split(strings.TrimPrefix(config, roleSearchPathAttr+"="), ", ") + for i := range result { + result[i] = strings.Trim(result[i], `"`) + } return result } } diff --git a/postgresql/resource_postgresql_role_test.go b/postgresql/resource_postgresql_role_test.go index ac299ac8..b8d4f1f4 100644 --- a/postgresql/resource_postgresql_role_test.go +++ b/postgresql/resource_postgresql_role_test.go @@ -53,7 +53,7 @@ func TestAccPostgresqlRole_Basic(t *testing.T) { resource.TestCheckResourceAttr("postgresql_role.sub_role", "name", "sub_role"), resource.TestCheckResourceAttr("postgresql_role.sub_role", "roles.#", "2"), - testAccCheckPostgresqlRoleExists("role_with_search_path", nil, []string{"bar", "foo"}), + testAccCheckPostgresqlRoleExists("role_with_search_path", nil, []string{"bar", "foo-with-hyphen"}), // The int part in the attr name is the schema.HashString of the value. resource.TestCheckResourceAttr("postgresql_role.sub_role", "roles.719783566", "myrole2"), @@ -346,6 +346,9 @@ func checkSearchPath(client *Client, roleName string, expectedSearchPath []strin } searchPath := strings.Split(searchPathStr, ", ") + for i := range searchPath { + searchPath[i] = strings.Trim(searchPath[i], `"`) + } sort.Strings(expectedSearchPath) if !reflect.DeepEqual(searchPath, expectedSearchPath) { return fmt.Errorf( @@ -411,6 +414,6 @@ resource "postgresql_role" "sub_role" { resource "postgresql_role" "role_with_search_path" { name = "role_with_search_path" - search_path = ["bar", "foo"] + search_path = ["bar", "foo-with-hyphen"] } `