feat(update): disable subcmd in different provider

disable subcmd in different provider

Signed-off-by: ysicing <[email protected]>

Author: ysicing

cmd/manage/renewtls.go

@@ -16,7 +16,7 @@ func NewRenewTLS(f factory.Factory) *cobra.Command {
 	var force bool
 	rtls := &cobra.Command{
 		Use:     "renewtls",
-		Short:   "renew qucheng tls domain",
+		Short:   "renew tls domain",
 		Aliases: []string{"rtls", "rt"},
 		Version: "1.2.11",
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/platform.go

@@ -10,22 +10,27 @@ import (
 	"github.com/easysoft/qcadmin/cmd/app"
 	"github.com/easysoft/qcadmin/cmd/manage"
 	"github.com/easysoft/qcadmin/cmd/quickon"
+	"github.com/easysoft/qcadmin/internal/app/config"
 	"github.com/easysoft/qcadmin/internal/pkg/util/factory"
+	"github.com/easysoft/qcadmin/internal/pkg/util/kutil"
 	"github.com/spf13/cobra"
 )
 
 func newCmdApp(f factory.Factory) *cobra.Command {
 	appCmd := &cobra.Command{
 		Use:     "app",
-		Short:   "Manage Quickon applications",
-		Version: "20230330",
+		Short:   "Manage applications",
+		Version: "20230906",
+	}
+	cfg, _ := config.LoadConfig()
+	if cfg == nil || !cfg.Quickon.DevOps {
+		appCmd.AddCommand(app.NewCmdAppExec(f))
+		appCmd.AddCommand(app.NewCmdAppGet(f))
+		appCmd.AddCommand(app.NewCmdAppLogs(f))
+		appCmd.AddCommand(app.NewCmdAppInstall(f))
+		appCmd.AddCommand(app.NewCmdAppMarket(f))
 	}
-	appCmd.AddCommand(app.NewCmdAppExec(f))
-	appCmd.AddCommand(app.NewCmdAppGet(f))
-	appCmd.AddCommand(app.NewCmdAppLogs(f))
 	appCmd.AddCommand(app.NewCmdAppList(f))
-	appCmd.AddCommand(app.NewCmdAppInstall(f))
-	appCmd.AddCommand(app.NewCmdAppMarket(f))
 	return appCmd
 }
 
@@ -41,13 +46,18 @@ func newCmdPlatform(f factory.Factory) *cobra.Command {
 	platformCmd.AddCommand(quickon.InitCommand(f))
 	platformCmd.AddCommand(quickon.UninstallCommand(f))
 	platformCmd.AddCommand(manage.NewCmdPlugin(f))
-	platformCmd.AddCommand(manage.NewResetPassword(f))
-	platformCmd.AddCommand(manage.NewRenewTLS(f))
 	gdbCmd := &cobra.Command{
 		Use:   "gdb",
 		Short: "Manage Global Database",
 	}
 	gdbCmd.AddCommand(manage.NewCmdGdbList(f))
 	platformCmd.AddCommand(gdbCmd)
+	cfg, _ := config.LoadConfig()
+	if cfg == nil || !cfg.Quickon.DevOps {
+		platformCmd.AddCommand(manage.NewResetPassword(f))
+	}
+	if cfg == nil || kutil.IsLegalDomain(cfg.Domain) {
+		platformCmd.AddCommand(manage.NewRenewTLS(f))
+	}
 	return platformCmd
 }

cmd/root.go

@@ -15,6 +15,7 @@ import (
 	"github.com/easysoft/qcadmin/common"
 	"github.com/easysoft/qcadmin/internal/pkg/util/factory"
 	"github.com/easysoft/qcadmin/internal/pkg/util/log"
+	"github.com/ergoapi/util/color"
 	"github.com/ergoapi/util/excmd"
 	mcobra "github.com/muesli/mango-cobra"
 	"github.com/muesli/roff"
@@ -74,7 +75,9 @@ func BuildRoot(f factory.Factory) *cobra.Command {
 	rootCmd.AddCommand(newCmdDebug(f))
 
 	// Deprecated commands, will be removed in the future
-	rootCmd.AddCommand(newCmdApp(f))
+	deprecatedAppCommand := newCmdApp(f)
+	deprecatedAppCommand.Deprecated = fmt.Sprintf("use %s instead", color.SGreen("%s platform app", os.Args[0]))
+	rootCmd.AddCommand(deprecatedAppCommand)
 
 	args := os.Args
 	if len(args) > 1 {
@@ -106,8 +109,8 @@ func BuildRoot(f factory.Factory) *cobra.Command {
 func NewRootCmd(f factory.Factory) *cobra.Command {
 	return &cobra.Command{
 		Use:           "qcadmin",
-		SilenceUsage:  true,
-		SilenceErrors: true,
+		// SilenceUsage:  true,
+		// SilenceErrors: true,
 		Short:         "Easily bootstrap a secure control plane for QuCheng",
 		Aliases:       []string{"q"},
 		Example:       common.RootTPl,

common/vars.go

@@ -42,7 +42,8 @@ var (
 
 var (
 	ValidPrefixes     = []string{"qcadmin", "qc"}
-	ValidDomainSuffix = []string{"corp.cc"}
+	// ValidDomainSuffix valid domain suffix, haogs.cn is deprecated
+	ValidDomainSuffix = []string{"corp.cc", "haogs.cn"}
 )
 
 var CloudAPI = []cloudAPIS{

internal/pkg/util/httptls/httptls.go

@@ -17,6 +17,7 @@ import (
 	"github.com/easysoft/qcadmin/common"
 	"github.com/easysoft/qcadmin/internal/app/config"
 	qcexec "github.com/easysoft/qcadmin/internal/pkg/util/exec"
+	"github.com/easysoft/qcadmin/internal/pkg/util/kutil"
 	"github.com/easysoft/qcadmin/internal/pkg/util/log"
 )
 
@@ -25,7 +26,7 @@ func CheckReNewCertificate(force bool) (err error) {
 	log := log.GetInstance()
 	cfg, _ := config.LoadConfig()
 	domain := cfg.Domain
-	if strings.HasSuffix(domain, "haogs.cn") || strings.HasSuffix(domain, "corp.cc") {
+	if kutil.IsLegalDomain(domain) {
 		needRenew := false
 		if force {
 			needRenew = true

pkg/quickon/quickon.go

@@ -514,7 +514,7 @@ func (m *Meta) UnInstall() error {
 	repoCleanArgs := []string{"experimental", "helm", "repo-del"}
 	_ = qcexec.Command(os.Args[0], repoCleanArgs...).Run()
 	m.Log.Done("uninstall helm repo success")
-	if strings.HasSuffix(cfg.Domain, "haogs.cn") || strings.HasSuffix(cfg.Domain, "corp.cc") {
+	if kutil.IsLegalDomain(cfg.Domain) {
 		m.Log.Infof("clean domain %s", cfg.Domain)
 		if err := qcexec.Command(os.Args[0], "exp", "tools", "domain", "clean", cfg.Domain).Run(); err != nil {
 			m.Log.Warnf("clean domain %s failed, reason: %v", cfg.Domain, err)