update to go1.15.1

cloudfoundry · Sep 17, 2020 · 9687962 · 9687962
1 parent 06b4121
commit 9687962
Show file tree

Hide file tree

Showing 65 changed files with 1,033 additions and 1,004 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ env:
   global:
     - DBURL=postgres://postgres@localhost/autoscaler?sslmode=disable
     - NODE_VERSION=6.2
-    - GO_VERSION=1.13.3
+    - GO_VERSION=1.15.1
     - LOGLEVEL=info
 language: java
 cache:

diff --git a/scripts/generate_test_certs.sh b/scripts/generate_test_certs.sh
@@ -12,65 +12,65 @@ mkdir -p ${depot_path}
 
 
 # CA to distribute to autoscaler certs
-certstrap --depot-path ${depot_path} init --passphrase '' --common-name autoscalerCA --expires "20 years"
+certstrap --depot-path ${depot_path} init --passphrase '' --common-name autoscalerCA --years "20"
 mv -f ${depot_path}/autoscalerCA.crt ${depot_path}/autoscaler-ca.crt
 mv -f ${depot_path}/autoscalerCA.key ${depot_path}/autoscaler-ca.key
 
 # CA to distribute to dummy loggregator_agent certs
-certstrap --depot-path ${depot_path} init --passphrase '' --common-name loggregatorCA --expires "20 years"
+certstrap --depot-path ${depot_path} init --passphrase '' --common-name loggregatorCA --years "20"
 mv -f ${depot_path}/loggregatorCA.crt ${depot_path}/loggregator-ca.crt
 mv -f ${depot_path}/loggregatorCA.key ${depot_path}/loggregator-ca.key
 
 # metricscollector certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name metricscollector --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign metricscollector --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain metricscollector --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign metricscollector --CA autoscaler-ca --years "20"
 
 # scalingengine certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name scalingengine --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign scalingengine --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain scalingengine --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign scalingengine --CA autoscaler-ca --years "20"
 
 # eventgenerator certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name eventgenerator --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign eventgenerator --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain eventgenerator --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign eventgenerator --CA autoscaler-ca --years "20"
 
 # servicebroker certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name servicebroker --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign servicebroker --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain servicebroker --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign servicebroker --CA autoscaler-ca --years "20"
 # servicebroker certificate for internal
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name servicebroker_internal --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign servicebroker_internal --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain servicebroker_internal --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign servicebroker_internal --CA autoscaler-ca --years "20"
 
 # api certificate for internal connection
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name api --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign api --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain api --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign api --CA autoscaler-ca --years "20"
 
 # api certificate for public api
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name api_public --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign api_public --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain api_public --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign api_public --CA autoscaler-ca --years "20"
 
 # scheduler certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name scheduler --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign scheduler --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain scheduler --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign scheduler --CA autoscaler-ca --years "20"
 openssl pkcs12 -export -in ${depot_path}/scheduler.crt -inkey ${depot_path}/scheduler.key -out ${depot_path}/scheduler.p12 -name scheduler -password pass:123456
 keytool -importcert -alias autoscaler -file ${depot_path}/autoscaler-ca.crt -keystore ${depot_path}/autoscaler.truststore -storeType pkcs12 -storepass 123456 -noprompt
 
 
 # # loggregator test server certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name reverselogproxy
-certstrap --depot-path ${depot_path} sign reverselogproxy --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain reverselogproxy
+certstrap --depot-path ${depot_path} sign reverselogproxy --CA autoscaler-ca --years "20"
 
 # loggregator test client certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name reverselogproxy_client
-certstrap --depot-path ${depot_path} sign reverselogproxy_client --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain reverselogproxy_client
+certstrap --depot-path ${depot_path} sign reverselogproxy_client --CA autoscaler-ca --years "20"
 
 # metricserver test client certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name metricserver --ip 127.0.0.1
-certstrap --depot-path ${depot_path} sign metricserver --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain metricserver --ip 127.0.0.1
+certstrap --depot-path ${depot_path} sign metricserver --CA autoscaler-ca --years "20"
 
 # metricserver test client certificate
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name metricserver_client
-certstrap --depot-path ${depot_path} sign metricserver_client --CA autoscaler-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain metricserver_client
+certstrap --depot-path ${depot_path} sign metricserver_client --CA autoscaler-ca --years "20"
 
 # metricsforwarder certificate for loggregator_agent
-certstrap --depot-path ${depot_path} request-cert --passphrase '' --common-name metron
-certstrap --depot-path ${depot_path} sign metron --CA loggregator-ca --expires "20 years"
+certstrap --depot-path ${depot_path} request-cert --passphrase '' --domain metron
+certstrap --depot-path ${depot_path} sign metron --CA loggregator-ca --years "20"
diff --git a/src/autoscaler/api/publicapiserver/public_api_handler.go b/src/autoscaler/api/publicapiserver/public_api_handler.go
@@ -241,7 +241,7 @@ func (h *PublicApiHandler) GetScalingHistories(w http.ResponseWriter, r *http.Re
 	if resp.StatusCode != http.StatusOK {
 		h.logger.Error("Error occured during getting scaling histories", nil, lager.Data{"statusCode": resp.StatusCode, "body": string(responseData)})
 		handlers.WriteJSONResponse(w, resp.StatusCode, models.ErrorResponse{
-			Code:    string(resp.StatusCode),
+			Code:    http.StatusText(resp.StatusCode),
 			Message: string(responseData)})
 		return
 	}
@@ -306,7 +306,7 @@ func (h *PublicApiHandler) GetAggregatedMetricsHistories(w http.ResponseWriter,
 	if resp.StatusCode != http.StatusOK {
 		h.logger.Error("Error occured during getting metric histories", nil, lager.Data{"statusCode": resp.StatusCode, "body": string(responseData)})
 		handlers.WriteJSONResponse(w, resp.StatusCode, models.ErrorResponse{
-			Code:    string(resp.StatusCode),
+			Code:    http.StatusText(resp.StatusCode),
 			Message: string(responseData)})
 		return
 	}
@@ -376,7 +376,7 @@ func (h *PublicApiHandler) GetInstanceMetricsHistories(w http.ResponseWriter, r
 	if resp.StatusCode != http.StatusOK {
 		h.logger.Error("Error occured during getting metric histories", nil, lager.Data{"statusCode": resp.StatusCode, "body": string(responseData)})
 		handlers.WriteJSONResponse(w, resp.StatusCode, models.ErrorResponse{
-			Code:    string(resp.StatusCode),
+			Code:    http.StatusText(resp.StatusCode),
 			Message: string(responseData)})
 		return
 	}

diff --git a/src/autoscaler/db/db.go b/src/autoscaler/db/db.go
@@ -30,7 +30,9 @@ type DatabaseConfig struct {
 	MaxOpenConnections    int           `yaml:"max_open_connections"`
 	MaxIdleConnections    int           `yaml:"max_idle_connections"`
 	ConnectionMaxLifetime time.Duration `yaml:"connection_max_lifetime"`
+	ConnectionMaxIdleTime time.Duration `yaml:"connection_max_idletime"`
 }
+
 type DatabaseStatus interface {
 	GetDBStatus() sql.DBStats
 }

diff --git a/src/autoscaler/db/sqldb/appmetric_sqldb.go b/src/autoscaler/db/sqldb/appmetric_sqldb.go
@@ -37,6 +37,7 @@ func NewAppMetricSQLDB(dbConfig db.DatabaseConfig, logger lager.Logger) (*AppMet
 	sqldb.SetConnMaxLifetime(dbConfig.ConnectionMaxLifetime)
 	sqldb.SetMaxIdleConns(dbConfig.MaxIdleConnections)
 	sqldb.SetMaxOpenConns(dbConfig.MaxOpenConnections)
+	sqldb.SetConnMaxIdleTime(dbConfig.ConnectionMaxIdleTime)
 
 	return &AppMetricSQLDB{
 		dbConfig: dbConfig,

diff --git a/src/autoscaler/db/sqldb/appmetric_sqldb_test.go b/src/autoscaler/db/sqldb/appmetric_sqldb_test.go
@@ -38,6 +38,7 @@ var _ = Describe("AppMetricSQLDB", func() {
 			MaxOpenConnections:    10,
 			MaxIdleConnections:    5,
 			ConnectionMaxLifetime: 10 * time.Second,
+			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 		testMetricName = "Test-Metric-Name"
 

diff --git a/src/autoscaler/db/sqldb/binding_sqldb.go b/src/autoscaler/db/sqldb/binding_sqldb.go
@@ -34,6 +34,7 @@ func NewBindingSQLDB(dbConfig db.DatabaseConfig, logger lager.Logger) (*BindingS
 	sqldb.SetConnMaxLifetime(dbConfig.ConnectionMaxLifetime)
 	sqldb.SetMaxIdleConns(dbConfig.MaxIdleConnections)
 	sqldb.SetMaxOpenConns(dbConfig.MaxOpenConnections)
+	sqldb.SetConnMaxIdleTime(dbConfig.ConnectionMaxIdleTime)
 
 	return &BindingSQLDB{
 		dbConfig: dbConfig,

diff --git a/src/autoscaler/db/sqldb/binding_sqldb_test.go b/src/autoscaler/db/sqldb/binding_sqldb_test.go
@@ -34,6 +34,7 @@ var _ = Describe("BindingSqldb", func() {
 			MaxOpenConnections:    10,
 			MaxIdleConnections:    5,
 			ConnectionMaxLifetime: 10 * time.Second,
+			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 	})
 

diff --git a/src/autoscaler/db/sqldb/instancemetrics_sqldb.go b/src/autoscaler/db/sqldb/instancemetrics_sqldb.go
@@ -36,6 +36,7 @@ func NewInstanceMetricsSQLDB(dbConfig db.DatabaseConfig, logger lager.Logger) (*
 	sqldb.SetConnMaxLifetime(dbConfig.ConnectionMaxLifetime)
 	sqldb.SetMaxIdleConns(dbConfig.MaxIdleConnections)
 	sqldb.SetMaxOpenConns(dbConfig.MaxOpenConnections)
+	sqldb.SetConnMaxIdleTime(dbConfig.ConnectionMaxIdleTime)
 
 	return &InstanceMetricsSQLDB{
 		sqldb:    sqldb,

diff --git a/src/autoscaler/db/sqldb/instancemetrics_sqldb_test.go b/src/autoscaler/db/sqldb/instancemetrics_sqldb_test.go
@@ -44,6 +44,7 @@ var _ = Describe("InstancemetricsSqldb", func() {
 			MaxOpenConnections:    10,
 			MaxIdleConnections:    5,
 			ConnectionMaxLifetime: 10 * time.Second,
+			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 		instanceIndex = -1
 		testMetricName = "TestMetricType"

diff --git a/src/autoscaler/db/sqldb/lock_sqldb.go b/src/autoscaler/db/sqldb/lock_sqldb.go
@@ -37,6 +37,7 @@ func NewLockSQLDB(dbConfig db.DatabaseConfig, table string, logger lager.Logger)
 	sqldb.SetConnMaxLifetime(dbConfig.ConnectionMaxLifetime)
 	sqldb.SetMaxIdleConns(dbConfig.MaxIdleConnections)
 	sqldb.SetMaxOpenConns(dbConfig.MaxOpenConnections)
+	sqldb.SetConnMaxIdleTime(dbConfig.ConnectionMaxIdleTime)
 
 	return &LockSQLDB{
 		dbConfig: dbConfig,

diff --git a/src/autoscaler/db/sqldb/lock_sqldb_test.go b/src/autoscaler/db/sqldb/lock_sqldb_test.go
@@ -33,6 +33,7 @@ var _ = Describe("LockSqldb", func() {
 			MaxOpenConnections:    10,
 			MaxIdleConnections:    5,
 			ConnectionMaxLifetime: 10 * time.Second,
+			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 		testTTL = time.Duration(15) * time.Second
 	})

diff --git a/src/autoscaler/db/sqldb/policy_sqldb.go b/src/autoscaler/db/sqldb/policy_sqldb.go
@@ -34,6 +34,7 @@ func NewPolicySQLDB(dbConfig db.DatabaseConfig, logger lager.Logger) (*PolicySQL
 	sqldb.SetConnMaxLifetime(dbConfig.ConnectionMaxLifetime)
 	sqldb.SetMaxIdleConns(dbConfig.MaxIdleConnections)
 	sqldb.SetMaxOpenConns(dbConfig.MaxOpenConnections)
+	sqldb.SetConnMaxIdleTime(dbConfig.ConnectionMaxIdleTime)
 
 	return &PolicySQLDB{
 		dbConfig: dbConfig,

diff --git a/src/autoscaler/db/sqldb/policy_sqldb_test.go b/src/autoscaler/db/sqldb/policy_sqldb_test.go
@@ -43,6 +43,7 @@ var _ = Describe("PolicySQLDB", func() {
 			MaxOpenConnections:    10,
 			MaxIdleConnections:    5,
 			ConnectionMaxLifetime: 10 * time.Second,
+			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 	})
 

diff --git a/src/autoscaler/db/sqldb/scalingengine_sqldb.go b/src/autoscaler/db/sqldb/scalingengine_sqldb.go
@@ -35,6 +35,8 @@ func NewScalingEngineSQLDB(dbConfig db.DatabaseConfig, logger lager.Logger) (*Sc
 	sqldb.SetConnMaxLifetime(dbConfig.ConnectionMaxLifetime)
 	sqldb.SetMaxIdleConns(dbConfig.MaxIdleConnections)
 	sqldb.SetMaxOpenConns(dbConfig.MaxOpenConnections)
+	sqldb.SetConnMaxIdleTime(dbConfig.ConnectionMaxIdleTime)
+
 	return &ScalingEngineSQLDB{
 		dbConfig: dbConfig,
 		logger:   logger,

diff --git a/src/autoscaler/db/sqldb/scalingengine_sqldb_test.go b/src/autoscaler/db/sqldb/scalingengine_sqldb_test.go
@@ -41,6 +41,7 @@ var _ = Describe("ScalingEngineSqldb", func() {
 			MaxOpenConnections:    10,
 			MaxIdleConnections:    5,
 			ConnectionMaxLifetime: 10 * time.Second,
+			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 	})
 

diff --git a/src/autoscaler/db/sqldb/scheduler_sqldb.go b/src/autoscaler/db/sqldb/scheduler_sqldb.go
@@ -34,6 +34,7 @@ func NewSchedulerSQLDB(dbConfig db.DatabaseConfig, logger lager.Logger) (*Schedu
 	sqldb.SetConnMaxLifetime(dbConfig.ConnectionMaxLifetime)
 	sqldb.SetMaxIdleConns(dbConfig.MaxIdleConnections)
 	sqldb.SetMaxOpenConns(dbConfig.MaxOpenConnections)
+	sqldb.SetConnMaxIdleTime(dbConfig.ConnectionMaxIdleTime)
 
 	return &SchedulerSQLDB{
 		dbConfig: dbConfig,

diff --git a/src/autoscaler/db/sqldb/scheduler_sqldb_test.go b/src/autoscaler/db/sqldb/scheduler_sqldb_test.go
@@ -30,6 +30,7 @@ var _ = Describe("SchedulerSqldb", func() {
 			MaxOpenConnections:    10,
 			MaxIdleConnections:    5,
 			ConnectionMaxLifetime: 10 * time.Second,
+			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 	})
 

diff --git a/test-certs/api.crt b/test-certs/api.crt
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEMzCCAhugAwIBAgIQYPSFsLyRHP0YkixciPXwITANBgkqhkiG9w0BAQsFADAX
-MRUwEwYDVQQDEwxhdXRvc2NhbGVyQ0EwHhcNMTkwNjI5MTQyNTI1WhcNMzkwNjI5
-MTQyNTEyWjAOMQwwCgYDVQQDEwNhcGkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDdfjf1jZASZqMtkdUKAHHfzS69+dnKo0Eq+mE+1NZ6lrkrQzAnp9Di
-mntRHmtf3aGGU+jYj79H7IF+vcT64MRUI/dIPLU1RWbK1WXuhtj9XOne1++WH0/K
-I03/1w65+Y9wCrXHlz6HKUmjM9lvRbboiJ2xeBcnZ7uVb7uYz7ShBrMsPQaGZYzO
-zYb4nySoXNzbe0tZa0vjh87sPwC8EjLSbrtf7V2pDKTPe6egvyzjixMbm1qOBdqX
-tlQ5NvpHrsLYu3LIRW4gI0sa0+0Sp/uRSCRop6vD4eox0MbBsgmU9PLtr7wjgaaA
-/lHzvO9Y+/wxchYRq+wxtx9NEQbu3x7dAgMBAAGjgYMwgYAwDgYDVR0PAQH/BAQD
-AgO4MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUXbVM
-Mo8iOmGMe3yvUIe7FGeLbvIwHwYDVR0jBBgwFoAU8R5AdvAfvKGBXpp6q8xjCk55
-U/owDwYDVR0RBAgwBocEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAcQ8HclIcgYfm
-yIsLucviEdjedfiH+znGtL3ctIbuFhcuTiIflw3OVkuk7CVRgaqZEQ19fugE/pp9
-zPfiFaiwpwJphsQJnZaKzcNnT2FNt78ABGD7OwIwxh1Kx1+y6YqSYHtEdUNnzf0B
-dZOOQiMVRRlvWHr3JCUwNI2UMlRSuJ17WZCe/dsdJUVk7WdEaPrH2AqaJu9ktgUU
-tWetkdIZwLNlBupm3THiJPppZHz2uJicg4v/67908psj0zSrpDR4ySnGdVyh0sn+
-C/VjCeee7MS4twe9uE1SayVUF7YgrkRlY6rk2Ii4JmCu97JAAlP2gcgOdV95poa0
-K7aRfXaTUOXNv8E2+yTQ3TJcwo4ocb9+NYYjHbztlrWpdXxk4RciCADUZftsGJhO
-kaZ0xuMU2EDwxYm++i0RdXGVPqhjIvSrfLiKpe8YyJqpklMNuTBUxm3kOTkzgI0f
-MZM5ejgEIU32c7h0tJaxvvfByQNfPOPhh0moaFdabnsvWAMYEBgRfMxRy9Z2bI17
-i5oXrBHGkTkOCpNmpNFFXYJKL994S4i/B4qhaydHRjYfmjzok9ynNmidyNYQjqd1
-vljjGFI0PX0Zykmn6do/mEsKGAiBbIcu57k3hGfjmljYEJeyfEcR8uH5G00RPMQ3
-rqPt0EcaSD3WmGh+tNRFykllH/EvVcA=
+MIIEODCCAiCgAwIBAgIQW2Eu/m73sw7znm5SbdDAFTANBgkqhkiG9w0BAQsFADAX
+MRUwEwYDVQQDEwxhdXRvc2NhbGVyQ0EwHhcNMjAwOTE2MTAyOTM2WhcNNDAwOTE2
+MTAyOTMxWjAOMQwwCgYDVQQDEwNhcGkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC47tcMpcFwydBbduNk/ruyPYtmjcllZ9H6+1qeIn5I89aiIPFiKbVN
+jty1ywsSvkZUMqo09Fmya3D9kvytSYlzYz5JXC39qbDn6r7FS6XrafxC3mN16qI6
+frDwl55jPPr2TKzhDJB5nWpKMkamYjQomU3IFWRCDsSFZeg2m9srXAcT54DConoJ
+ifYdAq2wc71Za7+GOws5TcAiDurW718MJ67sxq4hB1LfAOUl9btE+xeKYcBo+WzK
+fWIV3JN6q2/+BnUCABetzbP15MiTO+IKR4zgDJhw3u0x7vDGCPnbsWwjdBXW/NSm
+LalV2lys+C9mkfeNsVFPilLgeSfzhM6xAgMBAAGjgYgwgYUwDgYDVR0PAQH/BAQD
+AgO4MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUJf7f
+CH6ncRnRRvRjmQLsCBAMN+UwHwYDVR0jBBgwFoAU4CJa4y+3ZQUwF5H+8TfAaUgH
+/b8wFAYDVR0RBA0wC4IDYXBphwR/AAABMA0GCSqGSIb3DQEBCwUAA4ICAQAn6dj3
+3dL89OlX1CPXh4m+napexf/aiahdxlp5tfC6ixa2YGfMJeRGBL3MRtC2FVLdnWBj
+lILU7FeTFH6GR/5pUV+YFEbbvmTdCaPlj0ov8sLxS4BwhHzcenjvbxqXc5ONlhx7
+jKFFlS0Il8j0guwDH817iFFAn2nqkXa5wVU5QWzkpjLTZfLQFQ8L9KF6CkXEBPHm
+CczIRJTh9R2X6vmPxif6aXsKzLIRpUybkDXb9GN9iX6i+Uc+Gtdjvu4LTQWrfiwq
+kXSl+pW17j5OMCxw/urlgCvxufWew3nrPMWvUfTtzVBRatyg/aZGWdr8I4JUkfwG
+/aEn2wWBZb5ffYZzj9ihrkGP5onJ/+iIsuZW0urrst0KKeNi/FmoP6dVk6LsT5zE
+Ar1vQ2NwZvuJ77IRQulx4hU9JEapYsOegiY5M1kUK4DXebiIajlUXr4pvtpkJrnU
+RdSxXXFuNCbfYVeHTREZ41wHpt5we7K27OzXqBqFieQTzJ0ZTFykGqU6AGV959FS
+KXlWKajPejjybWe0UomdoUfI1yzWHsUE+pNiv5s5smi0ACumZVOCTEftFVrzz+PD
+0nDBCb53CWWzOvcuBN8M6Ho/mL3oqFOVXEXMd7fVp69ACO3lgtwxt5Rn1PEL7p7v
+XF6ZTc34IjP+DjZAhLa6WlFT0kv94cRlAabx3g==
 -----END CERTIFICATE-----
diff --git a/test-certs/api.csr b/test-certs/api.csr
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIICdTCCAV0CAQAwDjEMMAoGA1UEAxMDYXBpMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA3X439Y2QEmajLZHVCgBx380uvfnZyqNBKvphPtTWepa5K0Mw
-J6fQ4pp7UR5rX92hhlPo2I+/R+yBfr3E+uDEVCP3SDy1NUVmytVl7obY/Vzp3tfv
-lh9PyiNN/9cOufmPcAq1x5c+hylJozPZb0W26IidsXgXJ2e7lW+7mM+0oQazLD0G
-hmWMzs2G+J8kqFzc23tLWWtL44fO7D8AvBIy0m67X+1dqQykz3unoL8s44sTG5ta
-jgXal7ZUOTb6R67C2LtyyEVuICNLGtPtEqf7kUgkaKerw+HqMdDGwbIJlPTy7a+8
-I4GmgP5R87zvWPv8MXIWEavsMbcfTREG7t8e3QIDAQABoCIwIAYJKoZIhvcNAQkO
-MRMwETAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQDdHmwo4PcZ
-1z/ryZQ9sij19wC0zxWpFJAlFqC+Lsfvdv0Gi1vwDQdG+F4S46pu6J7sr254DZI2
-HBqgMmBu9gP61CszKHZGQ+yxupHWm6Edx89QnalHAU63qpMTONphE463y12WtJr+
-noUhM2VSHJLm9Q3LVEQANv+lx7gNrzsgzfpexaCFNGMTKTV/intuDCD+E8/WBFW8
-ErB53ck4TwOQeuAlfeqNUxBPDa+E3bf6QXLIEZsBJZUau/vA6vR6Y6XyVGsubxbf
-2T0VNCNVzpLrsfHg8zxKqD2Rn8uFMCZ5kCYvWJV/KHmRYEw4gzhJ2Tb9STFslDP5
-ay8cf8Lz7rjf
+MIICejCCAWICAQAwDjEMMAoGA1UEAxMDYXBpMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAuO7XDKXBcMnQW3bjZP67sj2LZo3JZWfR+vtaniJ+SPPWoiDx
+Yim1TY7ctcsLEr5GVDKqNPRZsmtw/ZL8rUmJc2M+SVwt/amw5+q+xUul62n8Qt5j
+deqiOn6w8JeeYzz69kys4QyQeZ1qSjJGpmI0KJlNyBVkQg7EhWXoNpvbK1wHE+eA
+wqJ6CYn2HQKtsHO9WWu/hjsLOU3AIg7q1u9fDCeu7MauIQdS3wDlJfW7RPsXimHA
+aPlsyn1iFdyTeqtv/gZ1AgAXrc2z9eTIkzviCkeM4AyYcN7tMe7wxgj527FsI3QV
+1vzUpi2pVdpcrPgvZpH3jbFRT4pS4Hkn84TOsQIDAQABoCcwJQYJKoZIhvcNAQkO
+MRgwFjAUBgNVHREEDTALggNhcGmHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBAKGe
+A+Jm6RjdTEbd2tOEf/dYzZHoQyxpH5ATnN3ENc7BohA5hf1rIZnk2ixWI5cE6Ywn
+JETjNl0ypzT6xkkLhPJ5OaVnoUygK2oGePY8fS6oLNzkL7it+Z0MuWCDJ8rQoksT
+rQgWBxl5GRn0XtcbatMl3Yi7YmR2GQ+5/E+Fv5sy3YtfCzusmXIh74lEFvHtDm7C
+4ZZznw2fKoN1qVhajp8ZuFYeYgbuxZy8isGlU9s/vevXtizWQ4W8qEcu43qEHeOR
+wKeAwiRXSNGquEznMADrNk6o1Qy5Nc6pvy6a5sC+QxVNmeQRefA1Wfz9o3J0uR7h
+ePqY8kOtnRbFmcltzDQ=
 -----END CERTIFICATE REQUEST-----