1f349/orchid
4
0
Fork 0
mirror of https://github.com/1f349/orchid.git synced 2024-11-09 23:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused default resolver hack in tests

Browse Source
This commit is contained in:
Melon 2023-06-29 02:53:59 +01:00
parent 796b739aa1
commit 455d82c6d2
Signed by: melon
GPG Key ID: 6C9D970C50D26A25
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
renewal/service_test.go
View File

@ -2,7 +2,6 @@ package renewal
import ( import (
"bytes" "bytes"
"context"
"crypto/rand" "crypto/rand"
"crypto/rsa" "crypto/rsa"
"crypto/x509" "crypto/x509"
@ -54,7 +53,7 @@ func TestService_resolveCACertificate(t *testing.T) {
} }
func setupPebbleSuite(tb testing.TB) (*certgen.CertGen, func()) { func setupPebbleSuite(tb testing.TB) (*certgen.CertGen, func()) {
fmt.Println("Running pebble") log.Println("Running pebble")
pebbleTmp, err := os.MkdirTemp("", "pebble") pebbleTmp, err := os.MkdirTemp("", "pebble")
assert.NoError(tb, err) assert.NoError(tb, err)
assert.NoError(tb, os.WriteFile(filepath.Join(pebbleTmp, "pebble-config.json"), pebble.RawConfig, os.ModePerm)) assert.NoError(tb, os.WriteFile(filepath.Join(pebbleTmp, "pebble-config.json"), pebble.RawConfig, os.ModePerm))
@ -73,13 +72,6 @@ func setupPebbleSuite(tb testing.TB) (*certgen.CertGen, func()) {
assert.NoError(tb, os.WriteFile(filepath.Join(pebbleTmp, "certs", "localhost", "cert.pem"), serverTls.GetCertPem(), os.ModePerm)) assert.NoError(tb, os.WriteFile(filepath.Join(pebbleTmp, "certs", "localhost", "cert.pem"), serverTls.GetCertPem(), os.ModePerm))
assert.NoError(tb, os.WriteFile(filepath.Join(pebbleTmp, "certs", "localhost", "key.pem"), serverTls.GetKeyPem(), os.ModePerm)) assert.NoError(tb, os.WriteFile(filepath.Join(pebbleTmp, "certs", "localhost", "key.pem"), serverTls.GetKeyPem(), os.ModePerm))
// hack default resolver
net.DefaultResolver.PreferGo = true
net.DefaultResolver.Dial = func(ctx context.Context, network, address string) (net.Conn, error) {
tb.Logf("Custom Resolver %s - %s\n", network, address)
return nil, fmt.Errorf("ha failed")
}
dnsServer := test.MakeFakeDnsProv("127.0.0.34:5053") // 127.0.0.34:53 dnsServer := test.MakeFakeDnsProv("127.0.0.34:5053") // 127.0.0.34:53
dnsServer.AddRecursiveSOA("example.test.") dnsServer.AddRecursiveSOA("example.test.")
go dnsServer.Start() go dnsServer.Start()
@ -91,16 +83,13 @@ func setupPebbleSuite(tb testing.TB) (*certgen.CertGen, func()) {
command.Dir = pebbleTmp command.Dir = pebbleTmp
if command.Start() != nil { if command.Start() != nil {
log.Println("Installing pebble")
instCmd := exec.Command("go", "install", "github.com/letsencrypt/pebble/cmd/pebble@latest") instCmd := exec.Command("go", "install", "github.com/letsencrypt/pebble/cmd/pebble@latest")
assert.NoError(tb, instCmd.Run(), "Failed to start pebble make sure it is installed... go install github.com/letsencrypt/pebble/cmd/pebble@latest") assert.NoError(tb, instCmd.Run(), "Failed to start pebble make sure it is installed... go install github.com/letsencrypt/pebble/cmd/pebble@latest")
assert.NoError(tb, command.Start(), "failed to start pebble again") assert.NoError(tb, command.Start(), "failed to start pebble again")
} }
return serverTls, func() { return serverTls, func() {
// unhack default resolver
net.DefaultResolver.PreferGo = false
net.DefaultResolver.Dial = nil
fmt.Println("Killing pebble") fmt.Println("Killing pebble")
if command != nil && command.Process != nil { if command != nil && command.Process != nil {
assert.NoError(tb, command.Process.Kill()) assert.NoError(tb, command.Process.Kill())