add get query

hashicorp · Nov 11, 2024 · c576424 · c576424
1 parent e9eb2b1
commit c576424
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/testutil/postgresqlhelper.go b/testutil/postgresqlhelper.go
@@ -41,6 +41,33 @@ func defaultRunOpts(t *testing.T) docker.RunOptions {
 	}
 }
 
+func GetTestPGUser(t *testing.T, connURL string, username, password, query string) {
+	t.Helper()
+	t.Logf("[TRACE] Creating test user")
+
+	db, err := sql.Open("pgx", connURL)
+	defer db.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ctx := context.Background()
+	_, err = db.ExecContext(ctx, `SELECT set_config('log_statement', 'all', false);`)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var exists bool
+	err = db.QueryRowContext(ctx, "SELECT exists (SELECT rolname FROM pg_roles WHERE rolname=$1);", username).Scan(&exists)
+	if err != nil && err != sql.ErrNoRows {
+		t.Fatalf("user does not appear to exist: %w", err)
+	}
+	if !exists {
+		t.Fatalf("!exists: %w", err)
+	}
+	t.Logf("exists: %b", exists)
+}
+
 func CreateTestPGUser(t *testing.T, connURL string, username, password, query string) {
 	t.Helper()
 	t.Logf("[TRACE] Creating test user")

diff --git a/vault/resource_database_secret_backend_static_role_test.go b/vault/resource_database_secret_backend_static_role_test.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"os"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform-provider-vault/internal/consts"
 
@@ -181,7 +180,7 @@ CREATE ROLE "{{name}}" WITH
 
 	// create static database user
 	testutil.CreateTestPGUser(t, pgxURL.String(), username, "testpassword", testRoleStaticCreate)
-	time.Sleep(5)
+	testutil.GetTestPGUser(t, pgxURL.String(), username, "testpassword", testRoleStaticCreate)
 
 	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
@@ -209,6 +208,7 @@ CREATE ROLE "{{name}}" WITH
 			},
 		},
 	})
+	testutil.GetTestPGUser(t, pgxURL.String(), username, "testpassword", testRoleStaticCreate)
 }
 
 func testAccDatabaseSecretBackendStaticRoleCheckDestroy(s *terraform.State) error {