Skip to content

Commit a7562df

Browse files
committed
TUN-3233: List tunnels support filtering by deleted, name, existed at and id
1 parent 8daf1e8 commit a7562df

File tree

104 files changed

+10612
-5729
lines changed

Some content is hidden

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

104 files changed

+10612
-5729
lines changed

cmd/cloudflared/access/carrier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/cloudflare/cloudflared/logger"
1313
"github.com/cloudflare/cloudflared/validation"
1414
"github.com/pkg/errors"
15-
cli "gopkg.in/urfave/cli.v2"
15+
cli "github.com/urfave/cli/v2"
1616
)
1717

1818
// StartForwarder starts a client side websocket forward

cmd/cloudflared/access/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"golang.org/x/net/idna"
2222

2323
"github.com/getsentry/raven-go"
24-
"gopkg.in/urfave/cli.v2"
24+
"github.com/urfave/cli/v2"
2525
)
2626

2727
const (

cmd/cloudflared/cliutil/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/cloudflare/cloudflared/logger"
88
"github.com/pkg/errors"
9-
"gopkg.in/urfave/cli.v2"
9+
"github.com/urfave/cli/v2"
1010
)
1111

1212
type usageError string

cmd/cloudflared/config/configuration.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"runtime"
88

99
homedir "github.com/mitchellh/go-homedir"
10-
"gopkg.in/urfave/cli.v2"
11-
"gopkg.in/urfave/cli.v2/altsrc"
10+
"github.com/urfave/cli/v2"
11+
"github.com/urfave/cli/v2/altsrc"
1212
"gopkg.in/yaml.v2"
1313

1414
"github.com/cloudflare/cloudflared/validation"

cmd/cloudflared/generic_service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package main
55
import (
66
"os"
77

8-
cli "gopkg.in/urfave/cli.v2"
8+
cli "github.com/urfave/cli/v2"
99
)
1010

1111
func runApp(app *cli.App, shutdownC, graceShutdownC chan struct{}) {

cmd/cloudflared/linux_service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/cloudflare/cloudflared/cmd/cloudflared/config"
1212
"github.com/cloudflare/cloudflared/logger"
1313
"github.com/pkg/errors"
14-
cli "gopkg.in/urfave/cli.v2"
14+
cli "github.com/urfave/cli/v2"
1515
)
1616

1717
func runApp(app *cli.App, shutdownC, graceShutdownC chan struct{}) {

cmd/cloudflared/macos_service.go

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

9-
"gopkg.in/urfave/cli.v2"
9+
"github.com/urfave/cli/v2"
1010

1111
"github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
1212
"github.com/cloudflare/cloudflared/logger"

cmd/cloudflared/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
raven "github.com/getsentry/raven-go"
1919
homedir "github.com/mitchellh/go-homedir"
20-
cli "gopkg.in/urfave/cli.v2"
20+
cli "github.com/urfave/cli/v2"
2121

2222
"github.com/pkg/errors"
2323
)

cmd/cloudflared/tunnel/cmd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import (
4242
"github.com/google/uuid"
4343
"github.com/mitchellh/go-homedir"
4444
"github.com/pkg/errors"
45-
"gopkg.in/urfave/cli.v2"
46-
"gopkg.in/urfave/cli.v2/altsrc"
45+
"github.com/urfave/cli/v2"
46+
"github.com/urfave/cli/v2/altsrc"
4747
)
4848

4949
const (

cmd/cloudflared/tunnel/configuration.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/google/uuid"
2424
"github.com/mitchellh/go-homedir"
2525
"github.com/pkg/errors"
26+
"github.com/urfave/cli/v2"
2627
"golang.org/x/crypto/ssh/terminal"
27-
"gopkg.in/urfave/cli.v2"
2828
)
2929

3030
var (
@@ -302,7 +302,7 @@ func prepareTunnelConfig(
302302
NamedTunnel: namedTunnel,
303303
ReplaceExisting: c.Bool("force"),
304304
// turn off use of reconnect token and auth refresh when using named tunnels
305-
UseReconnectToken: compatibilityMode && c.Bool("use-reconnect-token"),
305+
UseReconnectToken: compatibilityMode && c.Bool("use-reconnect-token"),
306306
}, nil
307307
}
308308

0 commit comments

Comments
 (0)