From 5e5d4b6de160dc7533067e1c0d8403c3faac1a9f Mon Sep 17 00:00:00 2001
From: Alex Jones <alexsimonjones@gmail.com>
Date: Tue, 11 Apr 2023 21:17:31 +0100
Subject: [PATCH] chore: updating based on feedback

Signed-off-by: Alex Jones <alexsimonjones@gmail.com>
---
 cmd/filters/add.go            | 4 +---
 cmd/filters/list.go           | 4 ++--
 cmd/integration/activate.go   | 6 +++---
 cmd/integration/deactivate.go | 6 +++---
 cmd/integration/list.go       | 8 ++++----
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/cmd/filters/add.go b/cmd/filters/add.go
index 4433bc99a4..9ea4cb2f0c 100644
--- a/cmd/filters/add.go
+++ b/cmd/filters/add.go
@@ -20,9 +20,7 @@ var addCmd = &cobra.Command{
 		inputFilters := strings.Split(args[0], ",")
 		coreFilters, additionalFilters, integrationFilters := analyzer.ListFilters()
 
-		availableFilters := append(coreFilters, additionalFilters...)
-		availableFilters = append(availableFilters, integrationFilters...)
-
+		availableFilters := append(append(coreFilters, additionalFilters...), integrationFilters...)
 		// Verify filter exist
 		invalidFilters := []string{}
 		for _, f := range inputFilters {
diff --git a/cmd/filters/list.go b/cmd/filters/list.go
index 91b308da9c..133f6d6790 100644
--- a/cmd/filters/list.go
+++ b/cmd/filters/list.go
@@ -18,8 +18,8 @@ var listCmd = &cobra.Command{
 		activeFilters := viper.GetStringSlice("active_filters")
 		coreFilters, additionalFilters, integrationFilters := analyzer.ListFilters()
 
-		availableFilters := append(coreFilters, additionalFilters...)
-		availableFilters = append(availableFilters, integrationFilters...)
+		availableFilters := append(append(coreFilters, additionalFilters...), integrationFilters...)
+
 		if len(activeFilters) == 0 {
 			activeFilters = coreFilters
 		}
diff --git a/cmd/integration/activate.go b/cmd/integration/activate.go
index fabef52d02..d8ffda9701 100644
--- a/cmd/integration/activate.go
+++ b/cmd/integration/activate.go
@@ -13,17 +13,17 @@ var activateCmd = &cobra.Command{
 	Long:  ``,
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		intName := args[0]
+		integrationName := args[0]
 
 		integration := integration.NewIntegration()
 		// Check if the integation exists
-		err := integration.Activate(intName, namespace)
+		err := integration.Activate(integrationName, namespace)
 		if err != nil {
 			color.Red("Error: %v", err)
 			return
 		}
 
-		color.Green("Activated integration %s", intName)
+		color.Green("Activated integration %s", integrationName)
 	},
 }
 
diff --git a/cmd/integration/deactivate.go b/cmd/integration/deactivate.go
index f5980a71eb..a9b5d7900c 100644
--- a/cmd/integration/deactivate.go
+++ b/cmd/integration/deactivate.go
@@ -16,16 +16,16 @@ var deactivateCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(1),
 	Long:  `For example e.g. k8sgpt integration deactivate trivy`,
 	Run: func(cmd *cobra.Command, args []string) {
-		intName := args[0]
+		integrationName := args[0]
 
 		integration := integration.NewIntegration()
 
-		if err := integration.Deactivate(intName, namespace); err != nil {
+		if err := integration.Deactivate(integrationName, namespace); err != nil {
 			color.Red("Error: %v", err)
 			return
 		}
 
-		color.Green("Deactivated integration %s", intName)
+		color.Green("Deactivated integration %s", integrationName)
 
 	},
 }
diff --git a/cmd/integration/list.go b/cmd/integration/list.go
index 5bd94a971e..d44b933184 100644
--- a/cmd/integration/list.go
+++ b/cmd/integration/list.go
@@ -15,12 +15,12 @@ var listCmd = &cobra.Command{
 	Short: "Lists built-in integrations",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		integration := integration.NewIntegration()
-		integrations := integration.List()
+		integrationProvider := integration.NewIntegration()
+		integrations := integrationProvider.List()
 
 		fmt.Println(color.YellowString("Active:"))
 		for _, i := range integrations {
-			b, err := integration.IsActivate(i)
+			b, err := integrationProvider.IsActivate(i)
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)
@@ -32,7 +32,7 @@ var listCmd = &cobra.Command{
 
 		fmt.Println(color.YellowString("Unused: "))
 		for _, i := range integrations {
-			b, err := integration.IsActivate(i)
+			b, err := integrationProvider.IsActivate(i)
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)