feat(aws)!: Remove aws subcommand (#6995)

aquasecurity · Jun 25, 2024 · 979e118 · 979e118
1 parent 648ead9
commit 979e118
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 76 deletions.
diff --git a/pkg/commands/app.go b/pkg/commands/app.go
@@ -93,7 +93,6 @@ func NewApp() *cobra.Command {
 		NewKubernetesCommand(globalFlags),
 		NewSBOMCommand(globalFlags),
 		NewVersionCommand(globalFlags),
-		NewAWSCommand(),
 		NewVMCommand(globalFlags),
 	)
 
@@ -105,6 +104,15 @@ func NewApp() *cobra.Command {
 		rootCmd.AddCommand(plugins...)
 	}
 
+	// TODO(simar7): Only for backwards support guidance, delete the subcommand after a while.
+	if cmd, _, _ := rootCmd.Find([]string{"aws"}); cmd == cmd.Root() { // "trivy aws" not installed
+		rootCmd.AddCommand(&cobra.Command{
+			Hidden: true,
+			Long:   "Trivy AWS is now available as an optional plugin. See github.com/aquasecurity/trivy-aws for details.",
+			Use:    "aws",
+		})
+	}
+
 	return rootCmd
 }
 
@@ -1014,14 +1022,6 @@ func NewKubernetesCommand(globalFlags *flag.GlobalFlagGroup) *cobra.Command {
 	return cmd
 }
 
-func NewAWSCommand() *cobra.Command {
-	cmd := &cobra.Command{
-		Deprecated: "Trivy AWS is now available as an optional plugin. See github.com/aquasecurity/trivy-aws for details",
-		Use:        "aws [flags]",
-	}
-	return cmd
-}
-
 func NewVMCommand(globalFlags *flag.GlobalFlagGroup) *cobra.Command {
 	vmFlags := &flag.Flags{
 		GlobalFlagGroup:        globalFlags,

diff --git a/pkg/flag/cloud_flags.go b/pkg/flag/cloud_flags.go
diff --git a/pkg/flag/options.go b/pkg/flag/options.go
@@ -301,7 +301,6 @@ type Flags struct {
 	GlobalFlagGroup        *GlobalFlagGroup
 	AWSFlagGroup           *AWSFlagGroup
 	CacheFlagGroup         *CacheFlagGroup
-	CloudFlagGroup         *CloudFlagGroup
 	DBFlagGroup            *DBFlagGroup
 	ImageFlagGroup         *ImageFlagGroup
 	K8sFlagGroup           *K8sFlagGroup
@@ -324,7 +323,6 @@ type Options struct {
 	GlobalOptions
 	AWSOptions
 	CacheOptions
-	CloudOptions
 	DBOptions
 	ImageOptions
 	K8sOptions
@@ -527,9 +525,6 @@ func (f *Flags) groups() []FlagGroup {
 	if f.RegoFlagGroup != nil {
 		groups = append(groups, f.RegoFlagGroup)
 	}
-	if f.CloudFlagGroup != nil {
-		groups = append(groups, f.CloudFlagGroup)
-	}
 	if f.AWSFlagGroup != nil {
 		groups = append(groups, f.AWSFlagGroup)
 	}
@@ -619,13 +614,6 @@ func (f *Flags) ToOptions(args []string) (Options, error) {
 		}
 	}
 
-	if f.CloudFlagGroup != nil {
-		opts.CloudOptions, err = f.CloudFlagGroup.ToOptions()
-		if err != nil {
-			return Options{}, xerrors.Errorf("cloud flag error: %w", err)
-		}
-	}
-
 	if f.CacheFlagGroup != nil {
 		opts.CacheOptions, err = f.CacheFlagGroup.ToOptions()
 		if err != nil {