Skip to content

Commit cd40a84

Browse files
klapkovklapkov
authored
Merge branch 'cloudfoundry:main' into main
2 parents 36c2e0c + 9586d81 commit cd40a84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+125
-125
lines changed

‎cmd/locket/certauthority/certauthority.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func generateCAAndKey(depotDir, commonName string) (string, string, error) {
130130
}
131131

132132
caLock.Lock()
133-
ca, err := pkix.CreateCertificateAuthority(caKey, "", time.Now().AddDate(1, 0, 0), "", "", "", "", commonName)
133+
ca, err := pkix.CreateCertificateAuthority(caKey, "", time.Now().AddDate(1, 0, 0), "", "", "", "", commonName, []string{})
134134
if err != nil {
135135
caLock.Unlock()
136136
return handleError(err)

‎cmd/locket/certauthority/certauthority_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package certauthority_test
33
import (
44
"testing"
55

6-
. "github.com/onsi/ginkgo"
6+
. "github.com/onsi/ginkgo/v2"
77
. "github.com/onsi/gomega"
88
)
99

‎cmd/locket/certauthority/certauthority_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88

99
"code.cloudfoundry.org/locket/cmd/locket/certauthority"
10-
. "github.com/onsi/ginkgo"
10+
. "github.com/onsi/ginkgo/v2"
1111
. "github.com/onsi/gomega"
1212
)
1313

‎cmd/locket/config/config.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ import (
77
"code.cloudfoundry.org/debugserver"
88
loggingclient "code.cloudfoundry.org/diego-logging-client"
99
"code.cloudfoundry.org/durationjson"
10-
"code.cloudfoundry.org/lager/lagerflags"
10+
"code.cloudfoundry.org/lager/v3/lagerflags"
1111
)
1212

1313
type LocketConfig struct {
14-
CaFile string `json:"ca_file"`
15-
CertFile string `json:"cert_file"`
16-
DatabaseConnectionString string `json:"database_connection_string"`
17-
MaxOpenDatabaseConnections int `json:"max_open_database_connections,omitempty"`
18-
MaxDatabaseConnectionLifetime durationjson.Duration `json:"max_database_connection_lifetime,omitempty"`
19-
DatabaseDriver string `json:"database_driver,omitempty"`
20-
KeyFile string `json:"key_file"`
21-
ListenAddress string `json:"listen_address"`
22-
SQLCACertFile string `json:"sql_ca_cert_file,omitempty"`
23-
SQLEnableIdentityVerification bool `json:"sql_enable_identity_verification,omitempty"`
24-
LoggregatorConfig loggingclient.Config `json:"loggregator"`
25-
ReportInterval durationjson.Duration `json:"report_interval,omitempty"`
14+
CaFile string `json:"ca_file"`
15+
CertFile string `json:"cert_file"`
16+
DatabaseConnectionString string `json:"database_connection_string"`
17+
MaxOpenDatabaseConnections int `json:"max_open_database_connections,omitempty"`
18+
MaxDatabaseConnectionLifetime durationjson.Duration `json:"max_database_connection_lifetime,omitempty"`
19+
DatabaseDriver string `json:"database_driver,omitempty"`
20+
KeyFile string `json:"key_file"`
21+
ListenAddress string `json:"listen_address"`
22+
SQLCACertFile string `json:"sql_ca_cert_file,omitempty"`
23+
SQLEnableIdentityVerification bool `json:"sql_enable_identity_verification,omitempty"`
24+
LoggregatorConfig loggingclient.Config `json:"loggregator"`
25+
ReportInterval durationjson.Duration `json:"report_interval,omitempty"`
2626
debugserver.DebugServerConfig
2727
lagerflags.LagerConfig
2828
}

‎cmd/locket/config/config_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package config_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

‎cmd/locket/config/config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"code.cloudfoundry.org/debugserver"
99
loggingclient "code.cloudfoundry.org/diego-logging-client"
1010
"code.cloudfoundry.org/durationjson"
11-
"code.cloudfoundry.org/lager/lagerflags"
11+
"code.cloudfoundry.org/lager/v3/lagerflags"
1212
"code.cloudfoundry.org/locket/cmd/locket/config"
1313

14-
. "github.com/onsi/ginkgo"
14+
. "github.com/onsi/ginkgo/v2"
1515
. "github.com/onsi/gomega"
1616
)
1717

‎cmd/locket/locket_suite_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"code.cloudfoundry.org/bbs/test_helpers/sqlrunner"
1313
"code.cloudfoundry.org/inigo/helpers/portauthority"
1414

15-
. "github.com/onsi/ginkgo"
15+
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
"github.com/onsi/gomega/gexec"
1818
"github.com/tedsuo/ifrit"
19-
"github.com/tedsuo/ifrit/ginkgomon"
19+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
2020

2121
"testing"
2222
)

‎cmd/locket/main.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"code.cloudfoundry.org/debugserver"
1414
loggingclient "code.cloudfoundry.org/diego-logging-client"
1515
"code.cloudfoundry.org/go-loggregator/v8/runtimeemitter"
16-
"code.cloudfoundry.org/lager"
17-
"code.cloudfoundry.org/lager/lagerflags"
16+
"code.cloudfoundry.org/lager/v3"
17+
"code.cloudfoundry.org/lager/v3/lagerflags"
1818
"code.cloudfoundry.org/locket"
1919
"code.cloudfoundry.org/locket/cmd/locket/config"
2020
"code.cloudfoundry.org/locket/db"
@@ -107,16 +107,16 @@ func main() {
107107
server := grpcserver.NewGRPCServer(logger, cfg.ListenAddress, tlsConfig, handler)
108108

109109
members := grouper.Members{
110-
{"server", server},
111-
{"burglar", burglar},
112-
{"lock-metrics-notifier", lockMetricsNotifier},
113-
{"db-metrics-notifier", dbMetricsNotifier},
114-
{"request-metrics-notifier", requestNotifier},
110+
{Name: "server", Runner: server},
111+
{Name: "burglar", Runner: burglar},
112+
{Name: "lock-metrics-notifier", Runner: lockMetricsNotifier},
113+
{Name: "db-metrics-notifier", Runner: dbMetricsNotifier},
114+
{Name: "request-metrics-notifier", Runner: requestNotifier},
115115
}
116116

117117
if cfg.DebugAddress != "" {
118118
members = append(grouper.Members{
119-
{"debug-server", debugserver.Runner(cfg.DebugAddress, reconfigurableSink)},
119+
{Name: "debug-server", Runner: debugserver.Runner(cfg.DebugAddress, reconfigurableSink)},
120120
}, members...)
121121
}
122122

‎cmd/locket/main_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ import (
1313
"code.cloudfoundry.org/diego-logging-client/testhelpers"
1414
"code.cloudfoundry.org/durationjson"
1515
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
16-
"code.cloudfoundry.org/lager/lagertest"
16+
"code.cloudfoundry.org/lager/v3/lagertest"
1717
"code.cloudfoundry.org/locket"
1818
"code.cloudfoundry.org/locket/cmd/locket/config"
1919
"code.cloudfoundry.org/locket/cmd/locket/testrunner"
2020
"code.cloudfoundry.org/locket/models"
2121
"google.golang.org/grpc/metadata"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525
"github.com/onsi/gomega/gbytes"
2626
"github.com/onsi/gomega/gexec"
2727
"github.com/tedsuo/ifrit"
28-
"github.com/tedsuo/ifrit/ginkgomon"
28+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
2929
)
3030

3131
var _ = Describe("Locket", func() {

‎cmd/locket/testrunner/runner.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"time"
1010

1111
"code.cloudfoundry.org/durationjson"
12-
"code.cloudfoundry.org/lager/lagerflags"
12+
"code.cloudfoundry.org/lager/v3/lagerflags"
1313
"code.cloudfoundry.org/locket"
1414
"code.cloudfoundry.org/locket/cmd/locket/certauthority"
1515
"code.cloudfoundry.org/locket/cmd/locket/config"
1616
"code.cloudfoundry.org/tlsconfig"
1717
. "github.com/onsi/gomega"
18-
"github.com/tedsuo/ifrit/ginkgomon"
18+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1919
)
2020

2121
var (

0 commit comments

Comments
 (0)