Skip to content

Commit

Permalink
test: pin docker image on postgres to 13.4-buster (#12636) (#12642)
Browse files Browse the repository at this point in the history
* test: pin docker image on postgres to 13.4-buster

* test: update all tests that uses postgres image to use 13.4-buster

Co-authored-by: Calvin Leung Huang <1883212+calvn@users.noreply.github.com>
  • Loading branch information
tomhjp and calvn committed Sep 27, 2021
1 parent bf52bf3 commit 0fd0699
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions builtin/logical/database/backend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ func TestBackend_BadConnectionString(t *testing.T) {
}
defer b.Cleanup(context.Background())

cleanup, _ := postgreshelper.PrepareTestContainer(t, "latest")
cleanup, _ := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup()

respCheck := func(req *logical.Request) {
Expand Down Expand Up @@ -394,7 +394,7 @@ func TestBackend_basic(t *testing.T) {
}
defer b.Cleanup(context.Background())

cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest")
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup()

// Configure a connection
Expand Down Expand Up @@ -601,7 +601,7 @@ func TestBackend_connectionCrud(t *testing.T) {
}
defer b.Cleanup(context.Background())

cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest")
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup()

// Configure a connection
Expand Down Expand Up @@ -789,7 +789,7 @@ func TestBackend_roleCrud(t *testing.T) {
}
defer b.Cleanup(context.Background())

cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest")
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup()

// Configure a connection
Expand Down Expand Up @@ -1038,7 +1038,7 @@ func TestBackend_allowedRoles(t *testing.T) {
}
defer b.Cleanup(context.Background())

cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest")
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup()

// Configure a connection
Expand Down Expand Up @@ -1235,7 +1235,7 @@ func TestBackend_RotateRootCredentials(t *testing.T) {
}
defer b.Cleanup(context.Background())

cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest")
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup()

connURL = strings.Replace(connURL, "postgres:secret", "{{username}}:{{password}}", -1)
Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/database/rotation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

func TestBackend_StaticRole_Rotations_PostgreSQL(t *testing.T) {
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "latest")
cleanup, connURL := postgreshelper.PrepareTestContainer(t, "13.4-buster")
defer cleanup()
uc := userCreator(func(t *testing.T, username, password string) {
createTestPGUser(t, connURL, username, password, testRoleStaticCreate)
Expand Down
4 changes: 2 additions & 2 deletions plugins/database/postgresql/postgresql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
)

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{}{
"connection_url": connURL,
Expand Down Expand Up @@ -867,7 +867,7 @@ func TestUsernameGeneration(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()

type testCase struct {
Expand Down

0 comments on commit 0fd0699

Please sign in to comment.