Fast test develop

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.20.5'
+          go-version: '1.21.0'
         id: go
       - uses: actions/checkout@v2
       - uses: actions/cache@v2

.github/workflows/vendoring.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.20.5'
+          go-version: '1.21.0'
         id: go
       - uses: actions/checkout@v2
       - uses: actions/cache@v2

go.mod

@@ -135,6 +135,7 @@ require (
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/miekg/dns v1.1.53 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

go.sum

@@ -1179,8 +1179,9 @@ github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/copystructure v1.1.1 h1:Bp6x9R1Wn16SIz3OfeDr0b7RnCG2OB66Y7PQyC/cvq4=
 github.com/mitchellh/copystructure v1.1.1/go.mod h1:EBArHfARyrSWO/+Wyr9zwEkc6XMFB9XyNgFNmRkZZU4=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
@@ -1195,8 +1196,9 @@ github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE=
 github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc=
 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=

src/internal/acceptance/metric-store/metric_store_test.go

@@ -28,7 +28,6 @@
 	"github.com/cloudfoundry/metric-store-release/src/pkg/rpc"
 	"github.com/cloudfoundry/metric-store-release/src/pkg/rulesclient"
 	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	prom_api_client "github.com/prometheus/client_golang/api"
 	prom_versioned_api_client "github.com/prometheus/client_golang/api/prometheus/v1"
@@ -188,7 +187,7 @@
 
 	var stopNode = func(tc *testContext, index int) {
 		tc.metricStoreProcesses[index].Terminate()
 		Eventually(tc.metricStoreProcesses[index].Exited, 2*time.Second).Should(BeClosed())
 	}
 
 	var performOnAllNodes = func(tc *testContext, operation func(*testContext, int)) {
@@ -331,11 +330,11 @@
 			tc.ingressAddrs[0],
 			tc.tlsConfig,
 		)
 		Expect(err).ToNot(HaveOccurred())
 		defer client.Close()
 
 		err = client.Write(rpcPoints)
 		Expect(err).ToNot(HaveOccurred())
 
 		return metricNameCounts
 	}
@@ -344,11 +343,11 @@
 		metricNameCounts := optimisticallyWritePoints(tc, points)
 
 		if tc.metricStoreProcesses[0].ExitCode() == -1 {
 			Eventually(func() int {
 				value, _, _ := tc.localEgressClient.LabelValues(context.Background(),
 					model.MetricNameLabel, result, minTime, maxTime)
 				return len(value)
 			}, 3).Should(Equal(len(metricNameCounts)))
 		}
 	}
 
@@ -379,7 +378,7 @@
 				return resp.StatusCode
 			}
 		}
 		Eventually(reload, 10).Should(Equal(http.StatusOK))
 	}
 
 	var waitForMetric = func(tc *testContext, name string) {
@@ -484,7 +483,7 @@
 				_, _, err := tc.localEgressClient.LabelValues(context.Background(), model.MetricNameLabel,
 					result, minTime, maxTime)
 				return err
-			}, 15).Should(Succeed())
+			}, 55).Should(Succeed())
 
 			Eventually(func() model.LabelValues {
 				value, _, err := tc.localEgressClient.LabelValues(context.Background(), model.MetricNameLabel,

src/internal/testing/certificates.go

@@ -84,60 +84,60 @@ func MutualTLSClientConfig() *tls.Config {
 }
 
 var localhostCert = []byte(`-----BEGIN CERTIFICATE-----
-MIIE4jCCAsqgAwIBAgIUI8iSzXNezM6iOg5vtRBhZn3mzUkwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAxMPbWV0cmljLXN0b3JlLWNhMB4XDTIyMDMwOTE1MDcwNVoX
-DTMyMDMwODE1MDcwNVowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3Rh
-dGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOqksMLdWozNxrD1QoESMcsq/AgGp628mr6C
-zc6D8xmxOE/fdeege5JBCSxuDvz8DxJI/UaDrbDUzH72X8bcsVRGf+hYt9dpnZWb
-UCrumJsjLQ2vX3TuypEx7mTdx4GzYaLgfMDf2fi3m3ny8iggwt529+45GRgQAxG5
-rVqvl5VYMLWTnMXUGJEGBGSeBOii6lbzJ28alaAh/gd7gDiTI1JLpR7RLm+YoLBx
-VVC66yNlQ4r8mov0xx3b4kwawgJK35UiH80APwzzIttFCfgnib/BIhZQPCHsNAZz
-g86CmPhnnhyw67wMVO1+U4rTv39LauRb2qG+M1sHyRakwWo87V8CAwEAAaOB9DCB
-8TAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhCAQ0EJhYk
-T3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1UdDgQWBBRt
-d279oTFLecXqo1YRvzMt4SxQnjBCBgNVHSMEOzA5gBRQx2ANY3ddbypAOvQQVwOm
-ZVmqDKEepBwwGjEYMBYGA1UEAxMPbWV0cmljLXN0b3JlLWNhggEBMA4GA1UdDwEB
-/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAUBgNVHREEDTALgglsb2NhbGhv
-c3QwDQYJKoZIhvcNAQELBQADggIBAD0qSeQjbYdQgootqizqYcvpgkWX0CKg9raK
-JwRiYNxhbuqtZ6huYeyxxou4WuebK/mO2Suvy6MSBydb7g9r7rTwM681rWITrobx
-udzEpW6BScs4vEIPXgYURsp+eOEyMKL5s6FRY3C6yD0tYQnvjzFx4pOB8eyCVHwD
-9ZCm3OZDT+acTWc4i0nz9WIQ1nOTwNeF/VJtQE9FH5yIJ1XESaHLlcy+8H4nIeec
-w8NBiVlO4oLcK3HWaYc+g9mujmoB6o9kLY0FO44u/Rt+X/Gcyv6teJNc0Eu7fhgv
-3ABuiZ0QkoD9DqBPIRNZf7ruafxS0pP7j93DxoNMYjaYjlXZdN0jUsLWJeW0CYzo
-VJ5f4b9X9DPvB3Migmcwrb2d9SPfnTmp34CdVqHRDnRIol99VXT5ilR0JERmY8Bq
-aFKhWHPzNEcRzii0LTcZknlcz5aQbPyQlXTG3kPHG3mAV2kSQJIa/FbgPtAjVOwe
-ZPBCSanpVaBP5ZvKK6Q6P83ycovlzEdzrbAApoAy7TA9jj8wGlm1Y+qtr+EnV/6k
-pWNFvRTImjB1drpKXpHNZg+F8NBC3SRZicdf7C1WOnXS18i6LT9P+s2SBwIqBP04
-ndr92NJF3OgurD6NCG7eIf4hSOxVvNbEtnfsJRYI9UKMFRMZ5O6uZQP517+0uwGC
-37se3AY6
+MIIFGjCCAwKgAwIBAgIJANCFTxfmfZSQMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+BAMTD21ldHJpYy1zdG9yZS1jYTAeFw0yMzA5MjkxMjMyMjJaFw0zMzA5MjgxMjMy
+MjJaMIGHMQswCQYDVQQGEwJBQTEQMA4GA1UECAwHWWVyZXZhbjEPMA0GA1UEBwwG
+UW9jaGFyMQ8wDQYDVQQKDAZWTXdhcmUxEDAOBgNVBAsMB1Bpdm90YWwxDTALBgNV
+BAMMBHRlc3QxIzAhBgkqhkiG9w0BCQEWFGhtYW51a3lhbkB2bXdhcmUuY29tMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApE91Uh3WaUoBPEiSfKrkpR+T
+/9wkGw2eo7vfWX6ECkpAXMX7om6WQ1MiU8rOruMRVtwfNN9XjWghVeG7BJt8a7i1
+pXkbJ37Qf7P4Xgkpf/yKpUXJgS9KTlFIoABJ7BRWr1zYSssQUSYGDjPN4skbaQ15
+TDDNqzTTrMxNxrDzPZpoMr2wSROHlOMaJz+1lfkQiU41WT4tOyj79sV2/AEu8sqW
+AJ1Jfsvrn3kw84UjqlI90qQI+52Ub9FlgCRxRd1MQK+T9D8Iu5MgvCgswPDEIGmX
+1CiQswetZC9OlhzWb/uZ/4G+a/+Hs4Ue2E+qrTezYX0cN/Lx7KFWklyLP+73cwID
+AQABo4H0MIHxMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG
++EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD
+VR0OBBYEFLXvuV9NrnKYsz2GV8aRHj8/TdaqMEIGA1UdIwQ7MDmAFF7vtw5ffhkt
+mUzXnb7T2Ctsy5Z+oR6kHDAaMRgwFgYDVQQDEw9tZXRyaWMtc3RvcmUtY2GCAQEw
+DgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBQGA1UdEQQNMAuC
+CWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAgEAn24VZ0tzlOTD9WzFlkUEotNE
+vbhPkRXi/qX+ZMA3b8nPK2flTgkiobgA5csvMLqgavFjiifNEDnHbU9SES2F4NrB
+IzogcfrtuF46vUiBsA3QHsDu3CuFUlWZvT042cjvIS1DM3Cq0tRu4ubZWfMz9R73
+d+NacWRgneQxtw2I1Tu6IOc7XmYAWwdrjS7HzHpXirPKGI5gcnHk46+BtnUndx9G
+d9kxVlPfUzePO2K9qlyE6uCDHsLxxFFkP7UDZTXIiIaVkVbrAskNHBf+e1P+iKJF
+Ukavvj1TGLez92twmh+CfxRY+i9D3OrxmSyOq25UkIs3lco8/lEQp0/j9QRKHxFw
+N8SJlz53wTE893uBiblbYPatx2G7RzcWAKTb+9mQDS2CLEDIDJppVrbKD57doGPy
+8t/l71NUcVan5p6uLLcVoqLCLRgubD8RMWAMLGZW2iRDH6k+TwOXJF+juKrCG99U
+xQmRGCv8uu29j/a3jbWfg0yZaGGFeBrQ0H2VH6v4zuPraHWiWmr1GBtrfCPxmzeE
+WSAvPm/89SA0oSUO8Ek8dtQsQed2FeK/tlrG9fg2NTKTdUOqj2Mx8aM9AvKiSM6G
+WGFilB0uXGOPk+nfMvyYi2uSbBk3qo0x2nfG7N+HgeP7lHNh4+oVGu+F3sd+hQ2M
+pKVCanVS4qbmatd/r0w=
 -----END CERTIFICATE-----`)
 
-var localhostKey = []byte(`-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDqpLDC3VqMzcaw
-9UKBEjHLKvwIBqetvJq+gs3Og/MZsThP33XnoHuSQQksbg78/A8SSP1Gg62w1Mx+
-9l/G3LFURn/oWLfXaZ2Vm1Aq7pibIy0Nr1907sqRMe5k3ceBs2Gi4HzA39n4t5t5
-8vIoIMLedvfuORkYEAMRua1ar5eVWDC1k5zF1BiRBgRkngTooupW8ydvGpWgIf4H
-e4A4kyNSS6Ue0S5vmKCwcVVQuusjZUOK/JqL9Mcd2+JMGsICSt+VIh/NAD8M8yLb
-RQn4J4m/wSIWUDwh7DQGc4POgpj4Z54csOu8DFTtflOK079/S2rkW9qhvjNbB8kW
-pMFqPO1fAgMBAAECggEABhQEEYLYZfitTUeH1H4bKhnP84lF7gXftaWqcnoP4bop
-15qAnGJs27SxlHlkDAD03FK7CjOTsUFMltFdA8gTE+LLoheCPk3vFhay30R/ptfP
-bUuosQe/2ZOt4Duv1QKc5IePfmjjZZekAGcJsikUbdzZE/kIrGCQeR9n3THalF9q
-wURS4pVZXGtO3CAbPeMxDL28N4o6EoYciVPJiYMvVV2Q4XPLZkkYRorPf4MJpC2p
-Bhj6g1UY6hvBmXkJuwRkJFPM0ed7HQ1djfJzAY8xJLI/uGYeQEHkuMvte5BjR6vS
-7Gt5o/17A8geGaoHZLgq8YrwKrtw6cuyhhi4db96WQKBgQDr5Rtm7zzWc4S+NX6c
-tEZpJPew8HzJ1H999hXBxpZXHfv+wd7gniAFzoGPwQSDOPR6SAgovJlfB6qADpOb
-M0S3vvNRx6+kICVPQlq9Z0ac9W7jcM3e6yX3kZLH0jsJhRI9T5y8sx8xapLjHM6z
-HJG/pWxvL34M6FTKbhnHqimitQKBgQD+pEZTDmZotBlIrqZ21STrxG/VM+flHcpZ
-8329pWZ6Y+1lEOTn0X9BhAdKKYsaxs6ze6dL0B6ZUMBH96n0Ym7iT+7/BgYCVySX
-1dX/wnXa3M9Xh9OyDhaQGBdUkPuvAhIVhHx5gf8iA6Dp9A6j7Cp23O+qIFPOmWlo
-pfFIF9j4QwKBgQC5qy+BOmY5KN1fVP2d26rb0VP/eZnOxim++/Ut+t+UHC6e2vtQ
-8kSkLWD+w96IZkjPAmkhnyhcis0hU9fMPXMl6O7c/H37ga28D68aCvKiUe+ApuXz
-QkQ08uiDzK3ZFVtA1Ku6PoYbwBVzGtZ6Vc9F9688aDYfdLJgTn6OEBoLTQKBgGci
-whkBzBi8WUFG+8VFrx6PAXyo+VOjLUIhjNwzEb6gmpZEsXHzOEeg4hL3oI/H1hB8
-FNZwBPSz8C018nA5LhAbsAE6v1RTV07oHTTp3jI3HQOmz+deLWVPXKOz1Tyc6hYt
-Av1z2ZI9Rf98CjH6hXh/I9MUJN2Y5UitbXx1rDthAoGAPS0P6EfrSVQzkpnaCD6B
-HGUi1bDH9rqAO62ztNLZ3pQ1c2ViEnYcwG0zJj3bFSmufUlerMQLjsulBOxefJJQ
-2svGsse8jo5Ke6m6zdZM5bJVoeKLlhPTdIqw2HaEa159j8vsDA4yKVIm5G7o33iH
-sCllQE0CjkIFb/zbp0B8v68=
------END PRIVATE KEY-----`)
+var localhostKey = []byte(`-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEApE91Uh3WaUoBPEiSfKrkpR+T/9wkGw2eo7vfWX6ECkpAXMX7
+om6WQ1MiU8rOruMRVtwfNN9XjWghVeG7BJt8a7i1pXkbJ37Qf7P4Xgkpf/yKpUXJ
+gS9KTlFIoABJ7BRWr1zYSssQUSYGDjPN4skbaQ15TDDNqzTTrMxNxrDzPZpoMr2w
+SROHlOMaJz+1lfkQiU41WT4tOyj79sV2/AEu8sqWAJ1Jfsvrn3kw84UjqlI90qQI
++52Ub9FlgCRxRd1MQK+T9D8Iu5MgvCgswPDEIGmX1CiQswetZC9OlhzWb/uZ/4G+
+a/+Hs4Ue2E+qrTezYX0cN/Lx7KFWklyLP+73cwIDAQABAoIBADT/mDUTgLxXbYyX
+UAC8UqHcTK2jwVWkj/36NHG2eDqldps2FRNwnjE7GIB0kzQf89DTkZFJVQE8jDwa
+Ymt7B6frXVPxe0vDANegIkWaqPMqb0Id/4AW093tJALP9QgcC1XnGbEOTMYQALYG
+CavT+G5rNSvZNg26LWi4QYIMQ3kj14YSGJBqATDv2gKS7lU9hGXQvZWULJKurgpn
+ptui/NkR3lFWjK8aa6aLPnAPp3+KisTyJxGYBoL7OPQHEy2P5es/Uw9W6JEoLaoi
+UXFsWH6ZP/2yeC4Q/wX7zhYkSDE8d6kY+JUC/x0Tg4ffNvVPwGFbJJlOJYge/vWV
+l8B1YUECgYEA077rfJeK4jQYv8UyFY8syLBoyMriNAEmU3C6STc62+ytjI+XM/tX
+eKEfAtyUJeiZ7DBH1z7cfSdhNlSDNlf4GnjdQQIlj+ga4UFVo7iuBqRyBkrjE0nr
+Xr3zt0f8LMBEWtzjffE/YJ1mA2chqYQDudsiIofz5FsNbmLqMcARneECgYEAxqaX
+l6hxs6UOR8z2vNvw/cz9dUu+S51ljfPaBRMR3NOUnAW0KFAbGi1LCthLKGtDkliJ
+XZeDjqFLeorBibxKXs4RSz9jT0lwfMdGaXOiIlby7FDYCc+lgQEZO7QRWfIe7J7s
+RToZRV+ZbRjpIp2Jysow55bYpBvY02i74R9Ot9MCgYEAqAMIVR7li2Ds9lUgzWyC
+i2c2bYRWAg+ben+qwGd7Y3+joTFaN1vKZyPpOFsPjhjG8VrJ1ifByeiSQQrD5j3c
+1hxq6qcqaMoxceRmcHccVpbrBsUq8mYnxVARbq9Gj7erRTGZrJfcwuuBQ1f0pM3k
+KveOWTnospvwx1LjIsCU+eECgYBf/6vsj2t7LD2tdyCZ/hQFIuYtpA/vTL4CDqEC
+qMeOFvWPPLZmcOfYC6FjOUmA2+1IsN6ZSxo5eDsYmiuTW1n5XM5Atf5RF6Vzt32Q
+gmANBkXY6+yrORy7LgO6tXdZJ0fIg7icb8o8m0lyzoIDx2wKgxGFKYHCNO7go5F/
+5nhNHwKBgEDz8M+OzXYg0y9qBNTaYbwEpOzHk3FL4Lei/qct8k/gzN5n/FshP6/W
+jBQWqa1w5CqCwcqmAN6dDwRO5SJWIv3UeX+wyAear440ebfFuGNw5Fuf1m7lqJth
+9A7NlLz+9jfzaPsOXeTiCvN1pDw+sNvHepkII2++pRPN7e1T7Wuo
+-----END RSA PRIVATE KEY-----`)

src/internal/testing/certs/localhost.crt

@@ -1,29 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIE4jCCAsqgAwIBAgIUI8iSzXNezM6iOg5vtRBhZn3mzUkwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAxMPbWV0cmljLXN0b3JlLWNhMB4XDTIyMDMwOTE1MDcwNVoX
-DTMyMDMwODE1MDcwNVowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3Rh
-dGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOqksMLdWozNxrD1QoESMcsq/AgGp628mr6C
-zc6D8xmxOE/fdeege5JBCSxuDvz8DxJI/UaDrbDUzH72X8bcsVRGf+hYt9dpnZWb
-UCrumJsjLQ2vX3TuypEx7mTdx4GzYaLgfMDf2fi3m3ny8iggwt529+45GRgQAxG5
-rVqvl5VYMLWTnMXUGJEGBGSeBOii6lbzJ28alaAh/gd7gDiTI1JLpR7RLm+YoLBx
-VVC66yNlQ4r8mov0xx3b4kwawgJK35UiH80APwzzIttFCfgnib/BIhZQPCHsNAZz
-g86CmPhnnhyw67wMVO1+U4rTv39LauRb2qG+M1sHyRakwWo87V8CAwEAAaOB9DCB
-8TAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhCAQ0EJhYk
-T3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1UdDgQWBBRt
-d279oTFLecXqo1YRvzMt4SxQnjBCBgNVHSMEOzA5gBRQx2ANY3ddbypAOvQQVwOm
-ZVmqDKEepBwwGjEYMBYGA1UEAxMPbWV0cmljLXN0b3JlLWNhggEBMA4GA1UdDwEB
-/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAUBgNVHREEDTALgglsb2NhbGhv
-c3QwDQYJKoZIhvcNAQELBQADggIBAD0qSeQjbYdQgootqizqYcvpgkWX0CKg9raK
-JwRiYNxhbuqtZ6huYeyxxou4WuebK/mO2Suvy6MSBydb7g9r7rTwM681rWITrobx
-udzEpW6BScs4vEIPXgYURsp+eOEyMKL5s6FRY3C6yD0tYQnvjzFx4pOB8eyCVHwD
-9ZCm3OZDT+acTWc4i0nz9WIQ1nOTwNeF/VJtQE9FH5yIJ1XESaHLlcy+8H4nIeec
-w8NBiVlO4oLcK3HWaYc+g9mujmoB6o9kLY0FO44u/Rt+X/Gcyv6teJNc0Eu7fhgv
-3ABuiZ0QkoD9DqBPIRNZf7ruafxS0pP7j93DxoNMYjaYjlXZdN0jUsLWJeW0CYzo
-VJ5f4b9X9DPvB3Migmcwrb2d9SPfnTmp34CdVqHRDnRIol99VXT5ilR0JERmY8Bq
-aFKhWHPzNEcRzii0LTcZknlcz5aQbPyQlXTG3kPHG3mAV2kSQJIa/FbgPtAjVOwe
-ZPBCSanpVaBP5ZvKK6Q6P83ycovlzEdzrbAApoAy7TA9jj8wGlm1Y+qtr+EnV/6k
-pWNFvRTImjB1drpKXpHNZg+F8NBC3SRZicdf7C1WOnXS18i6LT9P+s2SBwIqBP04
-ndr92NJF3OgurD6NCG7eIf4hSOxVvNbEtnfsJRYI9UKMFRMZ5O6uZQP517+0uwGC
-37se3AY6
+MIIFGjCCAwKgAwIBAgIJANCFTxfmfZSRMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+BAMTD21ldHJpYy1zdG9yZS1jYTAeFw0yMzA5MjkxMjMzMjVaFw0zMzA5MjgxMjMz
+MjVaMIGHMQswCQYDVQQGEwJBQTEQMA4GA1UECAwHWWVyZXZhbjEPMA0GA1UEBwwG
+UW9jaGFyMQ8wDQYDVQQKDAZWTXdhcmUxEDAOBgNVBAsMB1Bpdm90YWwxDTALBgNV
+BAMMBHRlc3QxIzAhBgkqhkiG9w0BCQEWFGhtYW51a3lhbkB2bXdhcmUuY29tMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApE91Uh3WaUoBPEiSfKrkpR+T
+/9wkGw2eo7vfWX6ECkpAXMX7om6WQ1MiU8rOruMRVtwfNN9XjWghVeG7BJt8a7i1
+pXkbJ37Qf7P4Xgkpf/yKpUXJgS9KTlFIoABJ7BRWr1zYSssQUSYGDjPN4skbaQ15
+TDDNqzTTrMxNxrDzPZpoMr2wSROHlOMaJz+1lfkQiU41WT4tOyj79sV2/AEu8sqW
+AJ1Jfsvrn3kw84UjqlI90qQI+52Ub9FlgCRxRd1MQK+T9D8Iu5MgvCgswPDEIGmX
+1CiQswetZC9OlhzWb/uZ/4G+a/+Hs4Ue2E+qrTezYX0cN/Lx7KFWklyLP+73cwID
+AQABo4H0MIHxMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG
++EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD
+VR0OBBYEFLXvuV9NrnKYsz2GV8aRHj8/TdaqMEIGA1UdIwQ7MDmAFF7vtw5ffhkt
+mUzXnb7T2Ctsy5Z+oR6kHDAaMRgwFgYDVQQDEw9tZXRyaWMtc3RvcmUtY2GCAQEw
+DgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBQGA1UdEQQNMAuC
+CWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAgEAZusGE+VNU+XYYJxIIMyGtP7W
+D/rKJfA9su6ziCD5M4INn3ipXkMdcSXiEzbCe/jkCgjICr4YR25vVXl0AYCOK7o4
+zvs4ZLiL+RrTjdi6T1JSLcpFPVQvfDqtdwr31jpk+4bi3SukU9yv7bki3APfbPUz
+HWRassKLNwsjoAy7N4UvnEvjDvTvgxkqSNaVmsQgy2vZoINdB1w1tEGa6Lflozyl
+o/3wwXb3y/cKJChO52YnsxEH5alImE4AhsWsJDrSz9HW3TetUB/WOHFNFCIvU3E/
+eCEjw2pGqM3xsdlGF4KMJ149nJMP3PFJOnGxaGrHNTkHSXX799OyEM+jJDM0KM7t
+bxRkY91ln5JZuVufWQTEz0G4bTzACWabLUeW5FQzLcru7CwpT3mVuU5TWCEn3Slx
+tn4S8VMuD0QNhNMbl6d6acyZ/tNdEtABFiAm7cfBBPrEHwa7x+TTxx8v6O+fxrWL
+XncNnHfYtSi9TK/FLmB+D1kQOR0wMA/RHgsrTVNvJq1/SjxXd48QATacGdHyELLL
+etiy74MkqChdSyVFLlY5vizgM9jh8KX2NeQkgWyoPlrOd3xBXXzZPpX36KE5nj5W
+WrHyEU/CFLjmqUH70c8f7lAqZduNL35tUdOC7VY6hNGP45JOnecZWIZMeUeSxQhP
+dQVBDTvYddukeSZMIA4=
 -----END CERTIFICATE-----

src/internal/testing/certs/localhost.csr

@@ -1,16 +1,18 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIICijCCAXICAQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAOqksMLdWozNxrD1QoESMcsq/AgGp628mr6Czc6D
-8xmxOE/fdeege5JBCSxuDvz8DxJI/UaDrbDUzH72X8bcsVRGf+hYt9dpnZWbUCru
-mJsjLQ2vX3TuypEx7mTdx4GzYaLgfMDf2fi3m3ny8iggwt529+45GRgQAxG5rVqv
-l5VYMLWTnMXUGJEGBGSeBOii6lbzJ28alaAh/gd7gDiTI1JLpR7RLm+YoLBxVVC6
-6yNlQ4r8mov0xx3b4kwawgJK35UiH80APwzzIttFCfgnib/BIhZQPCHsNAZzg86C
-mPhnnhyw67wMVO1+U4rTv39LauRb2qG+M1sHyRakwWo87V8CAwEAAaAAMA0GCSqG
-SIb3DQEBCwUAA4IBAQBqb8Q9UiHSqdSUwmx+nmBfWIkSzCY89ZovtzqHXc6jAkEK
-DWvKznXUI/a4kuQrpsG8WqK9sXNhYPLXvB6rywBPz+K8Y+p5UW1Wr+92XVACqbDe
-FjTwu+4SBI8UQQG17dz3y3En6GyU2iTsot2oDhhf0jhRdtYc6JO9VNlQissW2G+D
-wGyPqYZQgL0DfI0M2WfD0J5XdLDf3y644d48nUsEXOX2YJIzgWPQC9x/UKDghH9M
-vov6hRO2r7SDnoplk/77hD4KOIm2fJ89sP7qO+iY+AwToeXQDTQqA5hl+F0ZJSHE
-KJ1dKaiwp6M7wGXbjpKDz49hsQWBJne/7aWys/OY
+MIIC4jCCAcoCAQAwgYcxCzAJBgNVBAYTAkFBMRAwDgYDVQQIDAdZZXJldmFuMQ8w
+DQYDVQQHDAZRb2NoYXIxDzANBgNVBAoMBlZNd2FyZTEQMA4GA1UECwwHUGl2b3Rh
+bDENMAsGA1UEAwwEdGVzdDEjMCEGCSqGSIb3DQEJARYUaG1hbnVreWFuQHZtd2Fy
+ZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkT3VSHdZpSgE8
+SJJ8quSlH5P/3CQbDZ6ju99ZfoQKSkBcxfuibpZDUyJTys6u4xFW3B8031eNaCFV
+4bsEm3xruLWleRsnftB/s/heCSl//IqlRcmBL0pOUUigAEnsFFavXNhKyxBRJgYO
+M83iyRtpDXlMMM2rNNOszE3GsPM9mmgyvbBJE4eU4xonP7WV+RCJTjVZPi07KPv2
+xXb8AS7yypYAnUl+y+ufeTDzhSOqUj3SpAj7nZRv0WWAJHFF3UxAr5P0Pwi7kyC8
+KCzA8MQgaZfUKJCzB61kL06WHNZv+5n/gb5r/4ezhR7YT6qtN7NhfRw38vHsoVaS
+XIs/7vdzAgMBAAGgFTATBgkqhkiG9w0BCQcxBgwEdGVzdDANBgkqhkiG9w0BAQsF
+AAOCAQEATKkrVuj1HQDu/pRMDUGSNlZnvyahzVyGlD8TxYYc+NpFlze3tD4iSwtE
+loEfH8ScS9P2rXPhmuSZGM5OZr9x2aNbbyZtEkbAxYzBihYOc36aXhLvbHNXS6Jn
+OvxGF4mCQF9tRFbp9sGz/VvoatMaHRH/I2POzc8UReoSzf1+49PVbsRIfharvQyE
+Zs99CxsucHEwrB1Na+U1z0ZZg9JvXOHkNs3UiI37TncoPbHTx30G/cg+UzT+Ozi+
+hnFADipd6ntr6jXcNOv1xXh/cAiSujYtwlDnljyEb4DsZqdayBnk8tewO1S9Pe+o
+2ivXh8jlRv82q8zvR+CQ9dPA3iTg/A==
 -----END CERTIFICATE REQUEST-----

src/internal/testing/certs/localhost.key

@@ -1,28 +1,27 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDqpLDC3VqMzcaw
-9UKBEjHLKvwIBqetvJq+gs3Og/MZsThP33XnoHuSQQksbg78/A8SSP1Gg62w1Mx+
-9l/G3LFURn/oWLfXaZ2Vm1Aq7pibIy0Nr1907sqRMe5k3ceBs2Gi4HzA39n4t5t5
-8vIoIMLedvfuORkYEAMRua1ar5eVWDC1k5zF1BiRBgRkngTooupW8ydvGpWgIf4H
-e4A4kyNSS6Ue0S5vmKCwcVVQuusjZUOK/JqL9Mcd2+JMGsICSt+VIh/NAD8M8yLb
-RQn4J4m/wSIWUDwh7DQGc4POgpj4Z54csOu8DFTtflOK079/S2rkW9qhvjNbB8kW
-pMFqPO1fAgMBAAECggEABhQEEYLYZfitTUeH1H4bKhnP84lF7gXftaWqcnoP4bop
-15qAnGJs27SxlHlkDAD03FK7CjOTsUFMltFdA8gTE+LLoheCPk3vFhay30R/ptfP
-bUuosQe/2ZOt4Duv1QKc5IePfmjjZZekAGcJsikUbdzZE/kIrGCQeR9n3THalF9q
-wURS4pVZXGtO3CAbPeMxDL28N4o6EoYciVPJiYMvVV2Q4XPLZkkYRorPf4MJpC2p
-Bhj6g1UY6hvBmXkJuwRkJFPM0ed7HQ1djfJzAY8xJLI/uGYeQEHkuMvte5BjR6vS
-7Gt5o/17A8geGaoHZLgq8YrwKrtw6cuyhhi4db96WQKBgQDr5Rtm7zzWc4S+NX6c
-tEZpJPew8HzJ1H999hXBxpZXHfv+wd7gniAFzoGPwQSDOPR6SAgovJlfB6qADpOb
-M0S3vvNRx6+kICVPQlq9Z0ac9W7jcM3e6yX3kZLH0jsJhRI9T5y8sx8xapLjHM6z
-HJG/pWxvL34M6FTKbhnHqimitQKBgQD+pEZTDmZotBlIrqZ21STrxG/VM+flHcpZ
-8329pWZ6Y+1lEOTn0X9BhAdKKYsaxs6ze6dL0B6ZUMBH96n0Ym7iT+7/BgYCVySX
-1dX/wnXa3M9Xh9OyDhaQGBdUkPuvAhIVhHx5gf8iA6Dp9A6j7Cp23O+qIFPOmWlo
-pfFIF9j4QwKBgQC5qy+BOmY5KN1fVP2d26rb0VP/eZnOxim++/Ut+t+UHC6e2vtQ
-8kSkLWD+w96IZkjPAmkhnyhcis0hU9fMPXMl6O7c/H37ga28D68aCvKiUe+ApuXz
-QkQ08uiDzK3ZFVtA1Ku6PoYbwBVzGtZ6Vc9F9688aDYfdLJgTn6OEBoLTQKBgGci
-whkBzBi8WUFG+8VFrx6PAXyo+VOjLUIhjNwzEb6gmpZEsXHzOEeg4hL3oI/H1hB8
-FNZwBPSz8C018nA5LhAbsAE6v1RTV07oHTTp3jI3HQOmz+deLWVPXKOz1Tyc6hYt
-Av1z2ZI9Rf98CjH6hXh/I9MUJN2Y5UitbXx1rDthAoGAPS0P6EfrSVQzkpnaCD6B
-HGUi1bDH9rqAO62ztNLZ3pQ1c2ViEnYcwG0zJj3bFSmufUlerMQLjsulBOxefJJQ
-2svGsse8jo5Ke6m6zdZM5bJVoeKLlhPTdIqw2HaEa159j8vsDA4yKVIm5G7o33iH
-sCllQE0CjkIFb/zbp0B8v68=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEApE91Uh3WaUoBPEiSfKrkpR+T/9wkGw2eo7vfWX6ECkpAXMX7
+om6WQ1MiU8rOruMRVtwfNN9XjWghVeG7BJt8a7i1pXkbJ37Qf7P4Xgkpf/yKpUXJ
+gS9KTlFIoABJ7BRWr1zYSssQUSYGDjPN4skbaQ15TDDNqzTTrMxNxrDzPZpoMr2w
+SROHlOMaJz+1lfkQiU41WT4tOyj79sV2/AEu8sqWAJ1Jfsvrn3kw84UjqlI90qQI
++52Ub9FlgCRxRd1MQK+T9D8Iu5MgvCgswPDEIGmX1CiQswetZC9OlhzWb/uZ/4G+
+a/+Hs4Ue2E+qrTezYX0cN/Lx7KFWklyLP+73cwIDAQABAoIBADT/mDUTgLxXbYyX
+UAC8UqHcTK2jwVWkj/36NHG2eDqldps2FRNwnjE7GIB0kzQf89DTkZFJVQE8jDwa
+Ymt7B6frXVPxe0vDANegIkWaqPMqb0Id/4AW093tJALP9QgcC1XnGbEOTMYQALYG
+CavT+G5rNSvZNg26LWi4QYIMQ3kj14YSGJBqATDv2gKS7lU9hGXQvZWULJKurgpn
+ptui/NkR3lFWjK8aa6aLPnAPp3+KisTyJxGYBoL7OPQHEy2P5es/Uw9W6JEoLaoi
+UXFsWH6ZP/2yeC4Q/wX7zhYkSDE8d6kY+JUC/x0Tg4ffNvVPwGFbJJlOJYge/vWV
+l8B1YUECgYEA077rfJeK4jQYv8UyFY8syLBoyMriNAEmU3C6STc62+ytjI+XM/tX
+eKEfAtyUJeiZ7DBH1z7cfSdhNlSDNlf4GnjdQQIlj+ga4UFVo7iuBqRyBkrjE0nr
+Xr3zt0f8LMBEWtzjffE/YJ1mA2chqYQDudsiIofz5FsNbmLqMcARneECgYEAxqaX
+l6hxs6UOR8z2vNvw/cz9dUu+S51ljfPaBRMR3NOUnAW0KFAbGi1LCthLKGtDkliJ
+XZeDjqFLeorBibxKXs4RSz9jT0lwfMdGaXOiIlby7FDYCc+lgQEZO7QRWfIe7J7s
+RToZRV+ZbRjpIp2Jysow55bYpBvY02i74R9Ot9MCgYEAqAMIVR7li2Ds9lUgzWyC
+i2c2bYRWAg+ben+qwGd7Y3+joTFaN1vKZyPpOFsPjhjG8VrJ1ifByeiSQQrD5j3c
+1hxq6qcqaMoxceRmcHccVpbrBsUq8mYnxVARbq9Gj7erRTGZrJfcwuuBQ1f0pM3k
+KveOWTnospvwx1LjIsCU+eECgYBf/6vsj2t7LD2tdyCZ/hQFIuYtpA/vTL4CDqEC
+qMeOFvWPPLZmcOfYC6FjOUmA2+1IsN6ZSxo5eDsYmiuTW1n5XM5Atf5RF6Vzt32Q
+gmANBkXY6+yrORy7LgO6tXdZJ0fIg7icb8o8m0lyzoIDx2wKgxGFKYHCNO7go5F/
+5nhNHwKBgEDz8M+OzXYg0y9qBNTaYbwEpOzHk3FL4Lei/qct8k/gzN5n/FshP6/W
+jBQWqa1w5CqCwcqmAN6dDwRO5SJWIv3UeX+wyAear440ebfFuGNw5Fuf1m7lqJth
+9A7NlLz+9jfzaPsOXeTiCvN1pDw+sNvHepkII2++pRPN7e1T7Wuo
+-----END RSA PRIVATE KEY-----