remove mod cmd

cmd/mod.go

@@ -1,376 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/pkg/cmdconfig"
-	"github.com/turbot/steampipe/pkg/constants"
-	"github.com/turbot/steampipe/pkg/error_helpers"
-	"github.com/turbot/steampipe/pkg/filepaths"
-	"github.com/turbot/steampipe/pkg/modinstaller"
-	"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
-	"github.com/turbot/steampipe/pkg/steampipeconfig/parse"
-	"github.com/turbot/steampipe/pkg/utils"
-)
-
-// mod management commands
-func modCmd() *cobra.Command {
-	var cmd = &cobra.Command{
-		Use:   "mod [command]",
-		Args:  cobra.NoArgs,
-		Short: "Steampipe mod management",
-		Long: `Steampipe mod management.
-
-Mods enable you to run, build, and share dashboards, benchmarks and other resources.
-
-Find pre-built mods in the public registry at https://hub.steampipe.io.
-
-Examples:
-
-    # Create a new mod in the current directory
-    steampipe mod init
-
-    # Install a mod
-    steampipe mod install github.com/turbot/steampipe-mod-aws-compliance
-    
-    # Update a mod
-    steampipe mod update github.com/turbot/steampipe-mod-aws-compliance
-    
-    # List installed mods
-    steampipe mod list
-    
-    # Uninstall a mod
-    steampipe mod uninstall github.com/turbot/steampipe-mod-aws-compliance
-	`,
-	}
-
-	cmd.AddCommand(modInstallCmd())
-	cmd.AddCommand(modUninstallCmd())
-	cmd.AddCommand(modUpdateCmd())
-	cmd.AddCommand(modListCmd())
-	cmd.AddCommand(modInitCmd())
-	cmd.Flags().BoolP(constants.ArgHelp, "h", false, "Help for mod")
-
-	cmdconfig.OnCmd(cmd).
-		AddModLocationFlag()
-
-	return cmd
-}
-
-// install
-func modInstallCmd() *cobra.Command {
-	var cmd = &cobra.Command{
-		Use:   "install",
-		Run:   runModInstallCmd,
-		Short: "Install one or more mods and their dependencies",
-		Long: `Install one or more mods and their dependencies.
-
-Mods provide an easy way to share Steampipe queries, controls, and benchmarks.
-Find mods using the public registry at hub.steampipe.io.
-
-Examples:
-
-  # Install a mod(steampipe-mod-aws-compliance)
-  steampipe mod install github.com/turbot/steampipe-mod-aws-compliance
-
-  # Install a specific version of a mod
-  steampipe mod install github.com/turbot/steampipe-mod-aws-compliance@0.1
-
-  # Install a version of a mod using a semver constraint
-  steampipe mod install github.com/turbot/steampipe-mod-aws-compliance@'^1'
-
-  # Install all mods specified in the mod.sp and their dependencies
-  steampipe mod install
-
-  # Preview what steampipe mod install will do, without actually installing anything
-  steampipe mod install --dry-run`,
-	}
-
-	cmdconfig.OnCmd(cmd).
-		AddBoolFlag(constants.ArgPrune, true, "Remove unused dependencies after installation is complete").
-		AddBoolFlag(constants.ArgDryRun, false, "Show which mods would be installed/updated/uninstalled without modifying them").
-		AddBoolFlag(constants.ArgForce, false, "Install mods even if plugin/cli version requirements are not met (cannot be used with --dry-run)").
-		AddBoolFlag(constants.ArgHelp, false, "Help for install", cmdconfig.FlagOptions.WithShortHand("h")).
-		AddModLocationFlag()
-
-	return cmd
-}
-
-func runModInstallCmd(cmd *cobra.Command, args []string) {
-	ctx := cmd.Context()
-	utils.LogTime("cmd.runModInstallCmd")
-	defer func() {
-		utils.LogTime("cmd.runModInstallCmd end")
-		if r := recover(); r != nil {
-			error_helpers.ShowError(ctx, helpers.ToError(r))
-			exitCode = constants.ExitCodeUnknownErrorPanic
-		}
-	}()
-
-	// try to load the workspace mod definition
-	// - if it does not exist, this will return a nil mod and a nil error
-	workspacePath := viper.GetString(constants.ArgModLocation)
-	workspaceMod, err := parse.LoadModfile(workspacePath)
-	error_helpers.FailOnErrorWithMessage(err, "failed to load mod definition")
-
-	// if no mod was loaded, create a default
-	if workspaceMod == nil {
-		workspaceMod, err = createWorkspaceMod(ctx, cmd, workspacePath)
-		if err != nil {
-			exitCode = constants.ExitCodeModInstallFailed
-			error_helpers.FailOnError(err)
-		}
-	}
-
-	// if any mod names were passed as args, convert into formed mod names
-	opts := modinstaller.NewInstallOpts(workspaceMod, args...)
-	trimGitUrls(opts)
-	installData, err := modinstaller.InstallWorkspaceDependencies(ctx, opts)
-	if err != nil {
-		exitCode = constants.ExitCodeModInstallFailed
-		error_helpers.FailOnError(err)
-	}
-
-	fmt.Println(modinstaller.BuildInstallSummary(installData))
-}
-
-// uninstall
-func modUninstallCmd() *cobra.Command {
-	var cmd = &cobra.Command{
-		Use:   "uninstall",
-		Run:   runModUninstallCmd,
-		Short: "Uninstall a mod and its dependencies",
-		Long: `Uninstall a mod and its dependencies.
-
-Example:
-  
-  # Uninstall a mod
-  steampipe mod uninstall github.com/turbot/steampipe-mod-azure-compliance`,
-	}
-
-	cmdconfig.OnCmd(cmd).
-		AddBoolFlag(constants.ArgPrune, true, "Remove unused dependencies after uninstallation is complete").
-		AddBoolFlag(constants.ArgDryRun, false, "Show which mods would be uninstalled without modifying them").
-		AddBoolFlag(constants.ArgHelp, false, "Help for uninstall", cmdconfig.FlagOptions.WithShortHand("h")).
-		AddModLocationFlag()
-
-	return cmd
-}
-
-func runModUninstallCmd(cmd *cobra.Command, args []string) {
-	ctx := cmd.Context()
-	utils.LogTime("cmd.runModInstallCmd")
-	defer func() {
-		utils.LogTime("cmd.runModInstallCmd end")
-		if r := recover(); r != nil {
-			error_helpers.ShowError(ctx, helpers.ToError(r))
-			exitCode = constants.ExitCodeUnknownErrorPanic
-		}
-	}()
-
-	// try to load the workspace mod definition
-	// - if it does not exist, this will return a nil mod and a nil error
-	workspaceMod, err := parse.LoadModfile(viper.GetString(constants.ArgModLocation))
-	error_helpers.FailOnErrorWithMessage(err, "failed to load mod definition")
-	if workspaceMod == nil {
-		fmt.Println("No mods installed.")
-		return
-	}
-	opts := modinstaller.NewInstallOpts(workspaceMod, args...)
-	trimGitUrls(opts)
-	installData, err := modinstaller.UninstallWorkspaceDependencies(ctx, opts)
-	error_helpers.FailOnError(err)
-
-	fmt.Println(modinstaller.BuildUninstallSummary(installData))
-}
-
-// update
-func modUpdateCmd() *cobra.Command {
-	var cmd = &cobra.Command{
-		Use:   "update",
-		Run:   runModUpdateCmd,
-		Short: "Update one or more mods and their dependencies",
-		Long: `Update one or more mods and their dependencies.
-
-Example:
-
-  # Update a mod to the latest version allowed by its current constraint
-  steampipe mod update github.com/turbot/steampipe-mod-aws-compliance
-
-  # Update all mods specified in the mod.sp and their dependencies to the latest versions that meet their constraints, and install any that are missing
-  steampipe mod update`,
-	}
-
-	cmdconfig.OnCmd(cmd).
-		AddBoolFlag(constants.ArgPrune, true, "Remove unused dependencies after update is complete").
-		AddBoolFlag(constants.ArgForce, false, "Update mods even if plugin/cli version requirements are not met (cannot be used with --dry-run)").
-		AddBoolFlag(constants.ArgDryRun, false, "Show which mods would be updated without modifying them").
-		AddBoolFlag(constants.ArgHelp, false, "Help for update", cmdconfig.FlagOptions.WithShortHand("h")).
-		AddModLocationFlag()
-
-	return cmd
-}
-
-func runModUpdateCmd(cmd *cobra.Command, args []string) {
-	ctx := cmd.Context()
-	utils.LogTime("cmd.runModUpdateCmd")
-	defer func() {
-		utils.LogTime("cmd.runModUpdateCmd end")
-		if r := recover(); r != nil {
-			error_helpers.ShowError(ctx, helpers.ToError(r))
-			exitCode = constants.ExitCodeUnknownErrorPanic
-		}
-	}()
-
-	// try to load the workspace mod definition
-	// - if it does not exist, this will return a nil mod and a nil error
-	workspaceMod, err := parse.LoadModfile(viper.GetString(constants.ArgModLocation))
-	error_helpers.FailOnErrorWithMessage(err, "failed to load mod definition")
-	if workspaceMod == nil {
-		fmt.Println("No mods installed.")
-		return
-	}
-
-	opts := modinstaller.NewInstallOpts(workspaceMod, args...)
-	trimGitUrls(opts)
-	installData, err := modinstaller.InstallWorkspaceDependencies(ctx, opts)
-	error_helpers.FailOnError(err)
-
-	fmt.Println(modinstaller.BuildInstallSummary(installData))
-}
-
-// list
-func modListCmd() *cobra.Command {
-	var cmd = &cobra.Command{
-		Use:   "list",
-		Run:   runModListCmd,
-		Short: "List currently installed mods",
-		Long: `List currently installed mods.
-		
-Example:
-
-  # List installed mods
-  steampipe mod list`,
-	}
-
-	cmdconfig.OnCmd(cmd).
-		AddBoolFlag(constants.ArgHelp, false, "Help for list", cmdconfig.FlagOptions.WithShortHand("h")).
-		AddModLocationFlag()
-	return cmd
-}
-
-func runModListCmd(cmd *cobra.Command, _ []string) {
-	ctx := cmd.Context()
-	utils.LogTime("cmd.runModListCmd")
-	defer func() {
-		utils.LogTime("cmd.runModListCmd end")
-		if r := recover(); r != nil {
-			error_helpers.ShowError(ctx, helpers.ToError(r))
-			exitCode = constants.ExitCodeUnknownErrorPanic
-		}
-	}()
-
-	// try to load the workspace mod definition
-	// - if it does not exist, this will return a nil mod and a nil error
-	workspaceMod, err := parse.LoadModfile(viper.GetString(constants.ArgModLocation))
-	error_helpers.FailOnErrorWithMessage(err, "failed to load mod definition")
-	if workspaceMod == nil {
-		fmt.Println("No mods installed.")
-		return
-	}
-
-	opts := modinstaller.NewInstallOpts(workspaceMod)
-	installer, err := modinstaller.NewModInstaller(ctx, opts)
-	error_helpers.FailOnError(err)
-
-	treeString := installer.GetModList()
-	if len(strings.Split(treeString, "\n")) > 1 {
-		fmt.Println()
-	}
-	fmt.Println(treeString)
-}
-
-// init
-func modInitCmd() *cobra.Command {
-	var cmd = &cobra.Command{
-		Use:   "init",
-		Run:   runModInitCmd,
-		Short: "Initialize the current directory with a mod.sp file",
-		Long: `Initialize the current directory with a mod.sp file.
-		
-Example:
-
-  # Initialize the current directory with a mod.sp file
-  steampipe mod init`,
-	}
-
-	cmdconfig.OnCmd(cmd).
-		AddBoolFlag(constants.ArgHelp, false, "Help for init", cmdconfig.FlagOptions.WithShortHand("h")).
-		AddModLocationFlag()
-	return cmd
-}
-
-func runModInitCmd(cmd *cobra.Command, args []string) {
-	utils.LogTime("cmd.runModInitCmd")
-	ctx := cmd.Context()
-
-	defer func() {
-		utils.LogTime("cmd.runModInitCmd end")
-		if r := recover(); r != nil {
-			error_helpers.ShowError(ctx, helpers.ToError(r))
-			exitCode = constants.ExitCodeUnknownErrorPanic
-		}
-	}()
-	workspacePath := viper.GetString(constants.ArgModLocation)
-	if _, err := createWorkspaceMod(ctx, cmd, workspacePath); err != nil {
-		exitCode = constants.ExitCodeModInitFailed
-		error_helpers.FailOnError(err)
-	}
-}
-
-// helpers
-func createWorkspaceMod(ctx context.Context, cmd *cobra.Command, workspacePath string) (*modconfig.Mod, error) {
-	cancel, err := modinstaller.ValidateModLocation(ctx, workspacePath)
-	if err != nil {
-		return nil, err
-	}
-	if !cancel {
-		return nil, fmt.Errorf("mod %s cancelled", cmd.Name())
-	}
-
-	if _, exists := parse.ModfileExists(workspacePath); exists {
-		fmt.Println("Working folder already contains a mod definition file")
-		return nil, nil
-	}
-	// write mod definition file
-	mod := modconfig.CreateDefaultMod(workspacePath)
-	if err := mod.Save(); err != nil {
-		return nil, err
-	}
-	// only print message for mod init (not for mod install)
-	if cmd.Name() == "init" {
-		fmt.Printf("Created mod definition file '%s'\n", filepaths.DefaultModFilePath(workspacePath))
-	}
-
-	// load up the written mod file so that we get the updated
-	// block ranges
-	mod, err = parse.LoadModfile(workspacePath)
-	if err != nil {
-		return nil, err
-	}
-
-	return mod, nil
-}
-
-// Modifies(trims) the URL if contains http ot https in arguments
-func trimGitUrls(opts *modinstaller.InstallOpts) {
-	for i, url := range opts.ModArgs {
-		opts.ModArgs[i] = strings.TrimPrefix(url, "http://")
-		opts.ModArgs[i] = strings.TrimPrefix(url, "https://")
-	}
-}

cmd/root.go

@@ -91,7 +91,6 @@ func AddCommands() {
 		pluginCmd(),
 		queryCmd(),
 		serviceCmd(),
-		modCmd(),
 		generateCompletionScriptsCmd(),
 		pluginManagerCmd(),
 		loginCmd(),