Do some CLI tidying. Fixes #1921

* Remove version, use, install and upgrade commands * Replace version with command which outputs CLI version * Remove redundant version commands * Remove ziti fabric add/remove-identity commands * Remove lots of unused code * Remove 'ziti tunnel enroll' command, which is replaced by 'ziti edge enroll'
openziti · Apr 11, 2024 · fdbc327 · fdbc327
1 parent 43c785d
commit fdbc327
Show file tree

Hide file tree

Showing 43 changed files with 50 additions and 3,482 deletions.
diff --git a/ziti/cmd/cmd.go b/ziti/cmd/cmd.go
@@ -31,7 +31,6 @@ import (
 	"github.com/openziti/ziti/ziti/cmd/demo"
 	"github.com/openziti/ziti/ziti/cmd/edge"
 	"github.com/openziti/ziti/ziti/cmd/fabric"
-	"github.com/openziti/ziti/ziti/cmd/install"
 	"github.com/openziti/ziti/ziti/cmd/pki"
 	"github.com/openziti/ziti/ziti/cmd/templates"
 	c "github.com/openziti/ziti/ziti/constants"
@@ -143,18 +142,7 @@ func NewCmdRoot(in io.Reader, out, err io.Writer, cmd *cobra.Command) *cobra.Com
 	opsCommands.AddCommand(NewCmdLogFormat(out, err))
 	opsCommands.AddCommand(NewUnwrapIdentityFileCommand(out, err))
 
-	installCommands := []*cobra.Command{
-		install.NewCmdInstall(out, err),
-		install.NewCmdUpgrade(out, err),
-		install.NewCmdUse(out, err),
-		install.NewCmdVersion(out, err),
-	}
-
 	groups := templates.CommandGroups{
-		{
-			Message:  "Installing Ziti components:",
-			Commands: installCommands,
-		},
 		{
 			Message: "Working with Ziti resources:",
 			Commands: []*cobra.Command{
@@ -197,6 +185,7 @@ func NewCmdRoot(in io.Reader, out, err io.Writer, cmd *cobra.Command) *cobra.Com
 	cmd.Version = version.GetVersion()
 	cmd.SetVersionTemplate("{{printf .Version}}\n")
 	cmd.AddCommand(NewCmdArt(out, err))
+	cmd.AddCommand(common.NewVersionCmd())
 
 	return cmd
 }

diff --git a/ziti/tunnel/version.go → ziti/cmd/common/version.go b/ziti/tunnel/version.go → ziti/cmd/common/version.go
@@ -14,7 +14,7 @@
 	limitations under the License.
 */
 
-package tunnel
+package common
 
 import (
 	"fmt"

diff --git a/ziti/cmd/fabric/add_identity.go b/ziti/cmd/fabric/add_identity.go
diff --git a/ziti/cmd/fabric/remove_identity.go b/ziti/cmd/fabric/remove_identity.go
diff --git a/ziti/cmd/fabric/root.go b/ziti/cmd/fabric/root.go
@@ -31,7 +31,6 @@ import (
 func NewFabricCmd(p common.OptionsProvider) *cobra.Command {
 	fabricCmd := util.NewEmptyParentCmd("fabric", "Manage the Fabric components of a Ziti network using the Ziti Fabric REST and WebSocket APIs")
 
-	fabricCmd.AddCommand(newAddIdentityCmd(p), newRemoveIdentityCmd(p))
 	fabricCmd.AddCommand(newCreateCommand(p), newListCmd(p), newUpdateCommand(p), newDeleteCmd(p))
 	fabricCmd.AddCommand(newInspectCmd(p))
 	fabricCmd.AddCommand(newDbCmd(p))