With oss ci export (#88)

* Wait long enough for log to appear

* Fix go fmt

* Address channel buffer issue test flake

* Regenerate expiring certs

Signed-off-by: Amin Jamali <ajamali@vmware.com>

* Regenerate expiring certs

Signed-off-by: Marc Paquette <mpaquette@vmware.com>

---------

Signed-off-by: Amin Jamali <ajamali@vmware.com>
Signed-off-by: Marc Paquette <mpaquette@vmware.com>
Co-authored-by: Marc Paquette <mpaquette@vmware.com>

client.go

@@ -45,10 +45,10 @@ type AllocationRequest struct {
 
 func NewAllocationRequest(guid string, resource *Resource, generateLogMetrics bool, tags Tags) AllocationRequest {
 	return AllocationRequest{
-		Guid:     guid,
+		Guid:               guid,
 		GenerateLogMetrics: generateLogMetrics,
-		Resource: *resource,
-		Tags:     tags,
+		Resource:           *resource,
+		Tags:               tags,
 	}
 }
 

containermetrics/reporters_runner_test.go

@@ -2,6 +2,7 @@ package containermetrics_test
 
 import (
 	"errors"
+	"fmt"
 	"strconv"
 	"sync/atomic"
 	"time"
@@ -53,7 +54,7 @@ var _ = Describe("ReportersRunner", func() {
 	)
 
 	BeforeEach(func() {
-		logger = lagertest.NewTestLogger("test")
+		logger = lagertest.NewTestLogger(fmt.Sprintf("test-%d", GinkgoParallelProcess()))
 
 		interval = 10 * time.Second
 		testStart = time.Now()
@@ -880,7 +881,7 @@ var _ = Describe("ReportersRunner", func() {
 				})
 
 				It("reports the error", func() {
-					Eventually(logger.Logs()).Should(ContainElement(MatchFields(IgnoreExtras, Fields{
+					Eventually(logger.Logs(), 5*time.Second).Should(ContainElement(MatchFields(IgnoreExtras, Fields{
 						"Data": HaveKeyWithValue("error", "send-error-1"),
 					})))
 				})

depot/containerstore/dependencymanager_test.go

@@ -42,6 +42,8 @@ var _ = Describe("DependencyManager", func() {
 		var dependency2ReceivedCancel, dependency3ReceivedCancel bool
 
 		BeforeEach(func() {
+			downloadRateLimiter = make(chan struct{}, 3)
+			dependencyManager = containerstore.NewDependencyManager(cache, downloadRateLimiter)
 			dependencies = append(dependencies,
 				executor.CachedDependency{CacheKey: "cache-key-3", LogSource: "log-source-3", From: "https://example.com:8080/download-3", To: "/var/data/buildpack-3"},
 			)

depot/uploader/fixtures/correct/client.crt

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEMzCCAhugAwIBAgIQQA35MLUUoNGAYA04OgE+lzANBgkqhkiG9w0BAQsFADAU
-MRIwEAYDVQQDEwlzZXJ2ZXItY2EwHhcNMjIwNjI5MTg1NzU0WhcNMjMxMjI5MTg1
-NzQ4WjARMQ8wDQYDVQQDEwZjbGllbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCzJxRKrZE0pEIVqhtMZcXze1CszNYfwDg+SZdR3SCln1wjClaTMn8g
-LuANPzL6h6wlvLLAkVqXxe6D7TWfU/LLlLOquWYhKdyu8E109dbgEhAhGyQl+7Ru
-jW6ze9qq9+qEuj0KKzCDyViWePig7WeRvEqrEgYNGNxU0Ag3mEuEpVNrBL4IJCoI
-xUGfSzf4Qdi26d9kurCHBZcDXJMgsmZuwDzqkPiC869gm3PKbe0YT7yMzuwiYl1q
-8pv0WOz/CY7pYkpu5qRyE651AtJUHxeGl2BhBHfiITl5EDTyN9jC1RYbWJWF4Tos
-FVqZaXml8+Hpm/HgD38Q8ShJ1+aHgyftAgMBAAGjgYMwgYAwDgYDVR0PAQH/BAQD
-AgO4MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUe/fy
-Q/+Om1C9Bs0CCkiMl7FV/OMwHwYDVR0jBBgwFoAUJvSE7UBCylUVKcOleDKIgUz2
-uJkwDwYDVR0RBAgwBocEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAG/7zVVWe3VpF
-CME2aENnkZ/cqcvS2FcY5p+H1LmVZVnisNQefu+Qe9JIZ9G/3QhU/8zSj+kuBrwp
-N020HkKpy6jZRVHdzYjqK5i/humwQ/SnL5l+7Q3iOn6pSA2ldSLcFPuM5eFlzlQV
-9GbncfCSiLkO9UBKxON2/vHQct9sUyLd9nCZx9rIa+Xtedi+ddrEPyafgvp7XgLo
-xVVU69CydBP4oKz4dfDaSPd1imsoOX5fB8o+czzJHzAUrP5pD1k1YB3BFaboTpy8
-XjjlC7/elRW6mSKlRumgs7hmujCD5ounTSJRdfLGwLeC5cIGooVtUkg3iDoPEyYW
-QK2JjHl1zxnF8kN0cAo/C8Yeybrbs699A9WJT5uXtA3GdeRbWYsJHse7tQmY4DVD
-NSYUmy78oYKdTVrskQLo/R9Soe8uLUB5cTd3je/FcoqLOK4QD/J46pCJv8wxXBda
-UEX8Io1L3BTob4VzZR8cxFmAP+6mpo1WI3jsf4h07KSmQgPN0idUIrVqKFVPcRt7
-Mq1g46I+vlvmdx52BMnQ7woiiMRYXsGTTMioCHVOkGGpnBAtBz6TkZHu6d0Dixk+
-eOIBfBObtpDjmV8IkDGmNw5Und6TEzGSunAxB4sNt4OiTNQIODJJhbgNPDcJik/8
-SHrcwL4LHAiR8tYjsPnGLdIfPActETg=
+MIIEMzCCAhugAwIBAgIQcmHhUSVU3Rg7U8lcnZxd2TANBgkqhkiG9w0BAQsFADAU
+MRIwEAYDVQQDEwlzZXJ2ZXItY2EwHhcNMjMxMTA5MTUxMTIwWhcNMjUwNTA5MTUy
+MTE2WjARMQ8wDQYDVQQDEwZjbGllbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDeAztbNlSkdLQbihiKxNzXNun1lB3SZC3ah94BW5tayhIvYnIENa6l
+/SVFUDbWpD4ZcO9UtU/PXcw+EzKIw3FVA7p9hgcxYWBvQlZaIc7RQRtIMxtHz7rL
+QeXBgcs/leHFpeerGfEjx0iH+VgAZkzrajbAWjbykbPA2W+A6f4LJwjV19HjuWTh
+bEpDH6vfhkLKmPV5LUEByTNFpu4cx7nFQ5KHjgqybKdKRRfSpgseKeanxjSmfUZT
+8L6+YfUoG7n90xdg+IIIGz/2oMYgAcBu4MQFYatTX9LW3+yHOXL6A9h2JBPk2d0p
+yrqME+D/3zXkR/4aBpgUCkUolyND6JirAgMBAAGjgYMwgYAwDgYDVR0PAQH/BAQD
+AgO4MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUm60G
+OJwZS88FDAsiXquDOL8t4LowHwYDVR0jBBgwFoAUhzHcRDZX2WE82T04CPwerfyp
+ThcwDwYDVR0RBAgwBocEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAB7HCMO9lGg00
+orgxmXMTfLdrI4wHTyWKZyKLJULUwkvJwfhlyYlkQr23u73V3hee7pVjWMygTbOP
+YVCXNGmm2bK53l+Dd4HUE6dCphLTA2iuTjh/eSYew7YoS3aNa7i3hd2rE3puWLxE
+OdVPO+xC7WmaF65l+yoQ01TTFy68T7T9Cy86yOmdWolEtWL9CJmFf2FafN/g9Hib
+ZfF4lNd+lQG2oOqT33+YxfANSeo4KzdohOcsnsomtGfTykLamy4u0jWQLSv9DycB
+vzKn/9vpGg2moqTntZOcKQAbMDrjAF0Uvk5iqUlT0OWvUQOIQr/bblyzLLWsyWhN
+JhbLeAGtaXyfT9377yX0dhJOfTPJgwLQeu/NTVaGUPc+gLpPX7to57+rbr0/jRYm
+yiSzyDL+hxDmWvROopEgSrDG7eS37OfVT2OQoa8BZnLYzAErq9O1OtHgGD+19yC7
+xf6YYgsDaWfuljgIlvuIWq+ywqpGRkKzE1jQ4yr7AoB1eBE6vjDxmS3J9zc5w4b9
+HjSMbAr4rs34gMJHmcUgVKAx14P7k6MxWZ5HkAQ4+Oa7i3SaQy8+x0ROS+7OUV2f
+Qt3QmGoCLUWJ3NaOX/UwE4vqjyE4go9y+BqlvGopBOFIvW3SaUvp5Oin+Wx/Cyiu
+MvWfTME0zY6AXykR70USzGuBx8PJVgM=
 -----END CERTIFICATE-----

depot/uploader/fixtures/correct/client.csr

@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICeDCCAWACAQAwETEPMA0GA1UEAxMGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAsycUSq2RNKRCFaobTGXF83tQrMzWH8A4PkmXUd0gpZ9c
-IwpWkzJ/IC7gDT8y+oesJbyywJFal8Xug+01n1Pyy5SzqrlmISncrvBNdPXW4BIQ
-IRskJfu0bo1us3vaqvfqhLo9Ciswg8lYlnj4oO1nkbxKqxIGDRjcVNAIN5hLhKVT
-awS+CCQqCMVBn0s3+EHYtunfZLqwhwWXA1yTILJmbsA86pD4gvOvYJtzym3tGE+8
-jM7sImJdavKb9Fjs/wmO6WJKbuakchOudQLSVB8XhpdgYQR34iE5eRA08jfYwtUW
-G1iVheE6LBVamWl5pfPh6Zvx4A9/EPEoSdfmh4Mn7QIDAQABoCIwIAYJKoZIhvcN
-AQkOMRMwETAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQA6wAot
-R4NR/6XDNXtm7uIzB+G3CCajok/i1paqPTsSkCxCgN9Pgbg9cWvBPAKud3usupTI
-E5g2bDRiSfUR4ZCKr8W0zaDliwrN4toe8rb0Zs5TALiBRLc85GZMTSwVZEzggBqn
-7XDqNg4P9HmjWbmFDoOcFIiq9Lxx6HFnV8oR5T2Fk7tP+CRVq8jHhxRKzrhqlOwv
-XF6jB7QSqrS/iKzJjzTxL8MvGPhtD7G336wAz+5R8m8mwEI7aH+42ctUQJtqI1wn
-OQrRM7NtaaS8YiJRZBsBirWxGOGfrBgLrAHmBfIqfpNYeYrWfaQ0IL7bnH63P+Yv
-zhJijQuQjk8Q0P0c
+AAOCAQ8AMIIBCgKCAQEA3gM7WzZUpHS0G4oYisTc1zbp9ZQd0mQt2ofeAVubWsoS
+L2JyBDWupf0lRVA21qQ+GXDvVLVPz13MPhMyiMNxVQO6fYYHMWFgb0JWWiHO0UEb
+SDMbR8+6y0HlwYHLP5XhxaXnqxnxI8dIh/lYAGZM62o2wFo28pGzwNlvgOn+CycI
+1dfR47lk4WxKQx+r34ZCypj1eS1BAckzRabuHMe5xUOSh44KsmynSkUX0qYLHinm
+p8Y0pn1GU/C+vmH1KBu5/dMXYPiCCBs/9qDGIAHAbuDEBWGrU1/S1t/shzly+gPY
+diQT5NndKcq6jBPg/9815Ef+GgaYFApFKJcjQ+iYqwIDAQABoCIwIAYJKoZIhvcN
+AQkOMRMwETAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQDCXqNY
+GELf1pxsugH+NCk/w3skSZZy9/u2Q6CWlZ/30ohi1HokD0NTCNbAQyCse3dlYubc
+wvbVdacSDVvntjEkPhIzkiTmfvB3VFDFQPdnylf7hjQpw3bNZ+iMFEEZ0ICLnuzQ
+eFF1KvEJ4f6fNjxEuZ+iUSgYXqlkGBJxmOBYGeOR6SWvOtiQcTBLx/qpmiTRqlkN
+jobC7hZPluHsRNpqH0vOSh2AxWAHYK7dAvWksSnSBaHgQyzXcx+CW38ofrS1dnM/
+SY5nQTroU8TLZ79QQMP68bRUqaEazeFwfP5oldVmrKggqJB+rGQTR+Nksl19oeMv
+nHIrw9Mw/coNyN3h
 -----END CERTIFICATE REQUEST-----

depot/uploader/fixtures/correct/client.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

depot/uploader/fixtures/correct/server-ca.crl

@@ -1,16 +1,16 @@
 -----BEGIN X509 CRL-----
 MIICgzBtAgEBMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNVBAMTCXNlcnZlci1jYRcN
-MjIwNjI5MTg1NzU0WhcNMjMxMjI5MTg1NzQ5WjAAoCMwITAfBgNVHSMEGDAWgBQm
-9ITtQELKVRUpw6V4MoiBTPa4mTANBgkqhkiG9w0BAQsFAAOCAgEAVf0lAwrCud0z
-kii25FcgaB8sXFSSiwHhIEkA+wvkB+FG2ywtYP/ky0/JR1Ho2zdMJVDcjK57FDZi
-a1oeY16DPq/N9HQt4UrqD7tz1sR39VLswTY1+Mv/kHS/84qYWysZFu64YNIvyzgP
-9wkKtjhwlczpyHwXK+v6BtiI/EPEnsacAayTNV1EpPQhrQ3jrpfUEvGcbk3tVxux
-1Ia/ACN0xKTStdUN/KP2lGNaC/XakUKBfazWBhGWcVIbv1KhR0XHv0h5Ea2QS1Tj
-XzCLj6751Y5fDjr8LWIAfj34y5q4G7clNh2MCqIwOdoaJ8qFIFTzCkGqF0s2L0OG
-BQs1Bq5rJUJSRm2HdD5NEiYTKbtYczEXtroIGWzRbh1mt+qbU5Px/6XH/xA0ezLc
-UqWvCn56rs//bemuhUvo2SNrhn/6rOL5xLKemZDgvsBNH3rbo1kE5VZX77Mf6/3z
-zai5ND8u7mXPi8rIaCFMdXLTiACqvIHuh8Y2KhVX1iUXSb7itT8zwfEMJyovOF9c
-yigXWRKaXDvFowgVGwVcfUhg7ObU7t4UzgIQY462nvp5PadFfCSJRMNxD3tlYEPq
-/QcXkTRImLxkyI/2j1VQRrGbVOnC3jYvRlQEOf4o/ltMc7uvfTl9CxsP+upB/OHU
-VFqr5tdKCYn8HfBR9zTWtOUl9da7Bes=
+MjMxMTA5MTUyMTE5WhcNMjUwNTA5MTUyMTE3WjAAoCMwITAfBgNVHSMEGDAWgBSH
+MdxENlfZYTzZPTgI/B6t/KlOFzANBgkqhkiG9w0BAQsFAAOCAgEANAfKbi2NEDiD
+NDoM4rsESqf8xuTEGC7OhF2l4eeV5IxiZGULJB5pgEEfClc/dDv4+01g66Q/2vfW
+ZT5A38zIg04914bIHES9hwv1bdKQEIm8hTcS4KAdeEgKj6QzuvzVX4ojNQD+HZB1
+gYl3PmJ+iBNHhCVT6qja2OkiixzZEWAFLXhwj4fWWLlVCyfsSOUbbI2PhmO3hij5
+Mpaokv9TIJ35S2H94l64GFY6NwDvA/B3m08xqVCQpvLpftG4rdbVEDNCHWY4lrAP
+SPI8YH7hs2BFq078RtFEkYxw7/KUMmGKKeSaiTPHIrDRHG0789XFPtcOUVtQkvH6
+iq62CaHe1exsWaBnNs8rJQ+9fjU3+7pkTRFRXjisluSvxSFq9WZhmUMcBOh7GIt4
+wgHZLwQYYfnp7W2Bvu1jYXmWDsktujh9rypAxNc9QjBevK/iEjPdOKuSTr6dulmm
+3h2squCXlvsKF59DI539lf2WaN1/h+Bi+QGQovbUkkHDjiTbX7IUwY98TqBOA9m8
+9suPSyFKvZ0O4/o/WW39hvSpfn/0QI+kzwXErP3EaayioqY9WgfANC6qkfDqEMIY
+QwzJVRJBhb/xCLWRDLR/BnFLzlNKxPXalhoVU64X/CGh03PTNfb9V1HqFNG+6Qa2
+zLciSGnUeY2MK7StkxBObGukTMekTVU=
 -----END X509 CRL-----

depot/uploader/fixtures/correct/server-ca.crt

@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
 MIIE6DCCAtCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDEwlzZXJ2
-ZXItY2EwHhcNMjIwNjI5MTg1NzU0WhcNMjMxMjI5MTg1NzQ5WjAUMRIwEAYDVQQD
-EwlzZXJ2ZXItY2EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDUqVCN
-eMi5RkucG0BToruYI6QJBv5lboaa7sW5BK9Dx7M1vttxZzwRlaro8VTrUN0zxO4p
-lkc1OT6uU/mzVdcGgja8cnQzPVvGGyBZ1C1vEPzzMABHACt7pxtk0sZbCvepd11Q
-SrcsRIPVOzeKukmM8aE2IbCcn/Wosbzl85aVW8mE2BFGwexHfkeosvJZjSnuZi8U
-6RNzrAzo3ikhDp3da7dzm5GWC9XcU2Aj2VZvh74nOunf/SVyZe9Oh5YcGZKG6D5m
-XIAqhtyCoLwlQ2CURQrS2Olla/9mr7tewBQrERfU42ignPlqXU+69DlDLLObZNf5
-AC01TtAkzkVNz733Xn63Bbz60Ef1GShLXllh9vF3g30WCY2L+mrqcgXjmyFMaegc
-DvmVFDl0cy9i9589NwJUvJzYSoTjWplgvEW9T71Gx5Lq/+RNvRslZSqaXo9mjjJo
-OSNqXWoLPVX8x7snXCByf2Phgflb3Up/GpzJNsf93gNtCBgJSJKbv+g130H7O2Qq
-MuaVu7Ui1wZjbzLnHYArPDi34v2R30gRym/bmepBwUqVOP+yZpMZbu2sxNnD9UGF
-OcSH8K7I84Uwmhy02RTdKR3HrqfaMMhBdBqSnmiYxz8GEpkxQFO1/C4Qr9OLGxjQ
-sdnT8Lvu23lpxGhbpFZXey4u/vDI1iYBMHuapQIDAQABo0UwQzAOBgNVHQ8BAf8E
-BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUJvSE7UBCylUVKcOl
-eDKIgUz2uJkwDQYJKoZIhvcNAQELBQADggIBAL1rShaik2je5uLcbbVqhVv9pfAx
-ZFaWddHAl8LhiQ9ZaVWU4mDcisxfNqXe6GMN/f8HhmbMW4QptTZU8HNWOLMEzwS0
-Rjc9OmAPglOgEyu0ZRshOCzNSqH/3Nm/E5uNgBYzpkEHSevLb87DYswKVfHqxYyx
-8rbUlhGqvavOnDlHM3qfbM8Ihed21F9Zx6iaGLi5LJ6+mRFXSsuPsmXOA8xtwRL7
-djIiz0y4M8y3T4hVjStx2Z/3z+2z+JDeEIUbKFicrVjLlEkEWTcxuTTNfcBBtaGS
-YMo/Cy2SSQ1IW08XbvXwQfDR0UWsPtGtvhV5xDDlT6SMfM14U7zePVfYu2B3Jbir
-OBXnNQleCeN8LBg8g8AV4GGRAeM89lEcPohASo80AGeLrT1SZbKtWTuX7kGES0/3
-RESLC903gZJPyfoJ0ElEg3UFOZU1O0+q+3qz1lEoef3aGJcXKspG654gjcMJw/aZ
-eFdYmaFSJoBTHZ6sEWmIlTuX92WgVJQ9jRYuTNq8mGMAHYosPpeoSrEktzmJ3aC7
-JeW5uJMmYFeOli7A+gn9kjOHm3NkkSZjyvX0JseHQh1dtIoyRU4Joa4TtEO7B+mw
-BqZVum8bE76XLblDj4qXkFEyOfO9BXJ9itLkzdkhfRRXxttOMgakTZW4jRqhNCk+
-B+jrSNl1SCzjvIKX
+ZXItY2EwHhcNMjMxMTA5MTUxMTE5WhcNMjUwNTA5MTUyMTE3WjAUMRIwEAYDVQQD
+EwlzZXJ2ZXItY2EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDZ8UNb
+sS2UOR164XEYDdXnZYBiAPWJsEbFzshflI6ikukKeH3gx9PvwAHZTZK4eHko/AID
+ji3Vo+GfevZPszr1FYLLKu9bezZy5DlhA1LfVlQLGVK4vRl2RpsNWKd2/D7uR4Ab
++snGbqjoBjDy50GsaE2ECed6JtvJIlXq8qQ8Atyh7qXgbVsGvY3YWC4dTPwihf5D
+LwT8Ka3kxcWV/RJCHkOZ2aoDHGpH7Q1OuVft2Cv+o72kAuV5pfH5rjsUYreoU/Wu
+Cmz1xZxwlvISxXmqYzi2Al796gCs8AKN55FKyxSd06JEWqRm+Y9d4T4prU8b8IcO
+8MuEti2ph/BzAAgz6WWmkXgVeuU2/e6gEa1UCHukiU+YQunxLa0keikg0qjQauGv
+x+KIxy6jR3ak+hpuXZnMkO3FC8F2yqjiPU2aTyMb8lbPN4C6RHQNtRQenS6826qc
+JabmtmJF8PJTcnxSFEufIj+XMpc5x7b+6QIf1vAfzkDfgXt1dbQO0rF0Ga3sacb5
++AlMHKoP0kAY6CZowkiSvnYDOzubjbUVRh+NIsX2tkRDE8RYVkyLN9zvQoTLD0eO
+V7aIuIFw8+jRwa8UoSfc0OTbJ0LRp5NOFebHvZQTmWSKswCxYJZwzdKoRSotd15c
+oKfJmLM9GLOoftsqaV2yABzjHQKTiIIRKJEn3QIDAQABo0UwQzAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUhzHcRDZX2WE82T04
+CPwerfypThcwDQYJKoZIhvcNAQELBQADggIBAJa/upSsjjwd8ofy8TjeNvINXJGb
+s9lDoLKB5zzpHyJuPKWq3Kr1COPUXzwVF7mnm4U91tfrsT3531ePYTwm3sSh5oKo
+O85lQ9zhQoS/P+hLJoNkrktRbWcr/L3oznawhZjNisenBLIUOaHq/ZLBTLaGhXSM
+jmFGiPMPa5XOwW0xGROAQyK1X7NXF2tOjewOtK4jcQjcE09Bi31aGLG/OXf4jXpk
+W3ffOX8/0YdI1PIDBixGQXMoYdVbfSOmcuvg3ZvKkvhfrnkS1Bk4WOiILXSINIMU
+uvyQwG3+7y03wZmHffbW8VDOZaxYEdlqsXSooWZBZIu7799jQdjPqFswIjmU3CPF
+o8Spy6/NrFX4vUqSIHYQnbH2zAbrIHUkve/+D+XG+iOyoOjC9gHx2/m4m4WoBCjc
+N7kI7ZIhO/yuD4VNu1b2PcxR60XnfyD1D6xbUt0dI0Kg2PRtiiveG3Z728n6oB5o
+zfGsxIQ8Ya7dO7se7fRtpwLA/IxVX9zsqc8fogKWIQKCATaQg0QImL+QG2//jhCj
+FZOltEuxml3WT5lQ4keTT05sptb0BrDTG9VdSid/yYdl7KV/hwKmr6r9365JTk/f
+AGM2izgwzV5du36nDnaRVGiddBOfEab0BWxEyYBSRfXEGQUDcw8ekp5WzSZbPqhM
+hUmcoabqJHTQwLGL
 -----END CERTIFICATE-----