From 5d18a8be4968576b46b9873222f03db8ecfa47c3 Mon Sep 17 00:00:00 2001 From: gberl002 Date: Mon, 7 Nov 2022 14:20:38 -0500 Subject: [PATCH] Removing one last spurious TunnelerDisabled and updating test Signed-off-by: gberl002 --- ziti/cmd/ziti/cmd/create_config_router.go | 11 +++++------ ziti/cmd/ziti/cmd/create_config_router_edge_test.go | 3 --- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ziti/cmd/ziti/cmd/create_config_router.go b/ziti/cmd/ziti/cmd/create_config_router.go index 8fdac42e1..05c27a850 100644 --- a/ziti/cmd/ziti/cmd/create_config_router.go +++ b/ziti/cmd/ziti/cmd/create_config_router.go @@ -34,12 +34,11 @@ const ( type CreateConfigRouterOptions struct { CreateConfigOptions - RouterName string - WssEnabled bool - IsPrivate bool - TunnelerDisabled bool - TunnelerMode string - LanInterface string + RouterName string + WssEnabled bool + IsPrivate bool + TunnelerMode string + LanInterface string } var routerOptions = CreateConfigRouterOptions{} diff --git a/ziti/cmd/ziti/cmd/create_config_router_edge_test.go b/ziti/cmd/ziti/cmd/create_config_router_edge_test.go index 67b548c4c..bebf5d2a4 100644 --- a/ziti/cmd/ziti/cmd/create_config_router_edge_test.go +++ b/ziti/cmd/ziti/cmd/create_config_router_edge_test.go @@ -75,9 +75,6 @@ func TestTunnelerEnabledByDefault(t *testing.T) { // Create and run the CLI command without the tunnel flag config := createRouterConfig([]string{"edge", "--routerName", "myRouter"}) - // Expect disabled flag to be false - assert.False(t, data.Router.TunnelerDisabled, "Expected tunneler disabled flag to be false") - // Confirm tunneler is enabled in config output foundTunnel := false for i := 0; i < len(config.Listeners); i++ {