hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-28 15:20:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TUN-3607: Set up single-file logger with zerolog

Browse Source
This commit is contained in:
Areg Harutyunyan
2020-12-08 12:16:25 -06:00
committed by Adam Chalmers
parent 9bc1c0c70b
commit 2ea491b1d0
3 changed files with 95 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/cloudflared/tunnel/subcommand_context_test.go
View File

@@ -271,7 +271,7 @@ func (d *deleteMockTunnelStore) CleanupConnections(tunnelID uuid.UUID) error {
func Test_subcommandContext_Delete(t *testing.T) {
type fields struct {
c *cli.Context
logger logger.Service
log *zerolog.Logger
isUIEnabled bool
fs fileSystem
tunnelstoreClient *deleteMockTunnelStore
@@ -283,8 +283,7 @@ func Test_subcommandContext_Delete(t *testing.T) {
newCertPath := "new_cert.json"
tunnelID1 := uuid.MustParse("df5ed608-b8b4-4109-89f3-9f2cf199df64")
tunnelID2 := uuid.MustParse("af5ed608-b8b4-4109-89f3-9f2cf199df64")
logger, err := logger.New()
require.NoError(t, err)
log := zerolog.Nop()
var tests = []struct {
name string
@@ -296,7 +295,7 @@ func Test_subcommandContext_Delete(t *testing.T) {
{
name: "clean up continues if credentials are not found",
fields: fields{
logger: logger,
log: &log,
fs: mockFileSystem{
rf: func(filePath string) ([]byte, error) {
return nil, errors.New("file not found")
@@ -307,7 +306,7 @@ func Test_subcommandContext_Delete(t *testing.T) {
flagSet := flag.NewFlagSet("test0", flag.PanicOnError)
flagSet.String(CredFileFlag, newCertPath, "")
c := cli.NewContext(cli.NewApp(), flagSet, nil)
err = c.Set(CredFileFlag, newCertPath)
_ = c.Set(CredFileFlag, newCertPath)
return c
}(),
tunnelstoreClient: newDeleteMockTunnelStore(
@@ -331,7 +330,7 @@ func Test_subcommandContext_Delete(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
sc := &subcommandContext{
c: tt.fields.c,
logger: tt.fields.logger,
log: tt.fields.log,
isUIEnabled: tt.fields.isUIEnabled,
fs: tt.fields.fs,
tunnelstoreClient: tt.fields.tunnelstoreClient,