3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-05 05:16:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

pkg/storage/redis: update tests to use local certs + upstream image (#1306) (#1307)

Browse source 
Co-authored-by: Travis Groth <travisgroth@users.noreply.github.com>
This commit is contained in:
github-actions[bot] 2020-08-20 13:04:49 -04:00 • committed by GitHub
parent acfba615c6
commit 9c9cccb321
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkg/storage/redis/redis_test.go
View file

@ -48,12 +48,12 @@ func tlsConfig(rawURL string, t *testing.T) *tls.Config {
return tlsConfig return tlsConfig
} }
func runWithRedisDockerImage(repo, tag string, env []string, withTLS bool, testFunc func(t *testing.T), t *testing.T) { func runWithRedisDockerImage(t *testing.T, runOpts *dockertest.RunOptions, withTLS bool, testFunc func(t *testing.T)) {
pool, err := dockertest.NewPool("") pool, err := dockertest.NewPool("")
if err != nil { if err != nil {
t.Fatalf("Could not connect to docker: %s", err) t.Fatalf("Could not connect to docker: %s", err)
} }
resource, err := pool.Run(repo, tag, env) resource, err := pool.RunWithOptions(runOpts)
if err != nil { if err != nil {
t.Fatalf("Could not start resource: %s", err) t.Fatalf("Could not start resource: %s", err)
} }
@ -88,27 +88,29 @@ func TestDB(t *testing.T) {
if os.Getenv("GITHUB_ACTION") != "" && runtime.GOOS == "darwin" { if os.Getenv("GITHUB_ACTION") != "" && runtime.GOOS == "darwin" {
t.Skip("Github action can not run docker on MacOS") t.Skip("Github action can not run docker on MacOS")
} }
redisTLSEnv := []string{
"ALLOW_EMPTY_PASSWORD=yes", cwd, err := os.Getwd()
"REDIS_TLS_ENABLED=yes", assert.NoError(t, err)
"REDIS_TLS_CERT_FILE=/tls/redis.crt",
"REDIS_TLS_KEY_FILE=/tls/redis.key", tlsCmd := []string{
"REDIS_TLS_CA_FILE=/tls/ca.crt", "--port", "0",
"--tls-port", "6379",
"--tls-cert-file", "/tls/redis.crt",
"--tls-key-file", "/tls/redis.key",
"--tls-ca-cert-file", "/tls/ca.crt",
} }
tests := []struct { tests := []struct {
name string name string
repo string
tag string
env []string
withTLS bool withTLS bool
runOpts *dockertest.RunOptions
}{ }{
{"redis", "redis", "latest", nil, false}, {"redis", false, &dockertest.RunOptions{Repository: "redis", Tag: "latest"}},
{"redis TLS", "gnouc/pomerium-redis-tls", "latest", redisTLSEnv, true}, {"redis TLS", true, &dockertest.RunOptions{Repository: "redis", Tag: "latest", Cmd: tlsCmd, Mounts: []string{cwd + "/testdata/tls:/tls"}}},
} }
for _, tc := range tests { for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
runWithRedisDockerImage(tc.repo, tc.tag, tc.env, tc.withTLS, testDB, t) runWithRedisDockerImage(t, tc.runOpts, tc.withTLS, testDB)
}) })
} }
} }