scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 11:08:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: pin docker image on postgres to 13.4-buster (#12636)

Browse Source 
* test: pin docker image on postgres to 13.4-buster

* test: update all tests that uses postgres image to use 13.4-buster
This commit is contained in:
Calvin Leung Huang
2021-09-27 08:38:39 -07:00
committed by GitHub
parent 20a0ad3508
commit 8c9d93b852
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/logical/database/backend_test.go
View File

@@ -345,7 +345,7 @@ func TestBackend_BadConnectionString(t *testing.T) {
} }
defer b.Cleanup(context.Background()) defer b.Cleanup(context.Background())
cleanup, _ := postgreshelper.PrepareTestContainer(t, "latest") cleanup, _ := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup() defer cleanup()
respCheck := func(req *logical.Request) { respCheck := func(req *logical.Request) {
@@ -394,7 +394,7 @@ func TestBackend_basic(t *testing.T) {
} }
defer b.Cleanup(context.Background()) defer b.Cleanup(context.Background())
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest") cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup() defer cleanup()
// Configure a connection // Configure a connection
@@ -601,7 +601,7 @@ func TestBackend_connectionCrud(t *testing.T) {
} }
defer b.Cleanup(context.Background()) defer b.Cleanup(context.Background())
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest") cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup() defer cleanup()
// Configure a connection // Configure a connection
@@ -789,7 +789,7 @@ func TestBackend_roleCrud(t *testing.T) {
} }
defer b.Cleanup(context.Background()) defer b.Cleanup(context.Background())
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest") cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup() defer cleanup()
// Configure a connection // Configure a connection
@@ -1038,7 +1038,7 @@ func TestBackend_allowedRoles(t *testing.T) {
} }
defer b.Cleanup(context.Background()) defer b.Cleanup(context.Background())
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest") cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup() defer cleanup()
// Configure a connection // Configure a connection
@@ -1235,7 +1235,7 @@ func TestBackend_RotateRootCredentials(t *testing.T) {
} }
defer b.Cleanup(context.Background()) defer b.Cleanup(context.Background())
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest") cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup() defer cleanup()
connURL = strings.Replace(connURL, "postgres:secret", "{{username}}:{{password}}", -1) connURL = strings.Replace(connURL, "postgres:secret", "{{username}}:{{password}}", -1)

2
builtin/logical/database/rotation_test.go
View File

@@ -701,7 +701,7 @@ func assertWALCount(t *testing.T, s logical.Storage, expected int, key string) {
type userCreator func(t *testing.T, username, password string) type userCreator func(t *testing.T, username, password string)
func TestBackend_StaticRole_Rotations_PostgreSQL(t *testing.T) { func TestBackend_StaticRole_Rotations_PostgreSQL(t *testing.T) {
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest") cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup() defer cleanup()
uc := userCreator(func(t *testing.T, username, password string) { uc := userCreator(func(t *testing.T, username, password string) {
createTestPGUser(t, connURL, username, password, testRoleStaticCreate) createTestPGUser(t, connURL, username, password, testRoleStaticCreate)

4
plugins/database/postgresql/postgresql_test.go
View File

@@ -16,7 +16,7 @@ import (
) )
func getPostgreSQL(t *testing.T, options map[string]interface{}) (*PostgreSQL, func()) { func getPostgreSQL(t *testing.T, options map[string]interface{}) (*PostgreSQL, func()) {
cleanup, connURL := postgresql.PrepareTestContainer(t, "latest") cleanup, connURL := postgresql.PrepareTestContainer(t, "13.4-buster")
connectionDetails := map[string]interface{}{ connectionDetails := map[string]interface{}{
"connection_url": connURL, "connection_url": connURL,
@@ -867,7 +867,7 @@ func TestUsernameGeneration(t *testing.T) {
} }
func TestNewUser_CustomUsername(t *testing.T) { func TestNewUser_CustomUsername(t *testing.T) {
cleanup, connURL := postgresql.PrepareTestContainer(t, "latest") cleanup, connURL := postgresql.PrepareTestContainer(t, "13.4-buster")
defer cleanup() defer cleanup()
type testCase struct { type testCase struct {