Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: append coreAnalyzer if active_filter is empty and integration is added #441

Merged
merged 3 commits into from
May 19, 2023
Merged

fix: append coreAnalyzer if active_filter is empty and integration is added #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d506ff7
fix: append coreAnalyzer if active_filter is empty and integration is…
matthisholleville May 18, 2023
8c560af
Merge branch 'main' into fix/integration-and-filters
matthisholleville May 19, 2023
507cac4
Merge branch 'main' into fix/integration-and-filters
matthisholleville May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion cmd/integration/activate.go
View file
Open in desktop
Expand Up @@ -15,8 +15,10 @@ package integration

import (
"github.com/fatih/color"
"github.com/k8sgpt-ai/k8sgpt/pkg/analyzer"
"github.com/k8sgpt-ai/k8sgpt/pkg/integration"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)

// activateCmd represents the activate command
Expand All @@ -27,10 +29,17 @@ var activateCmd = &cobra.Command{
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
integrationName := args[0]
coreFilters, _, _ := analyzer.ListFilters()

// Update filters
activeFilters := viper.GetStringSlice("active_filters")
if len(activeFilters) == 0 {
activeFilters = coreFilters
}

integration := integration.NewIntegration()
// Check if the integation exists
err := integration.Activate(integrationName, namespace)
err := integration.Activate(integrationName, namespace, activeFilters)
if err != nil {
color.Red("Error: %v", err)
return
Expand Down
5 changes: 1 addition & 4 deletions pkg/integration/integration.go
View file
Open in desktop
Expand Up @@ -66,14 +66,11 @@ func (*Integration) Get(name string) (IIntegration, error) {
return integrations[name], nil
}

func (*Integration) Activate(name string, namespace string) error {
func (*Integration) Activate(name string, namespace string, activeFilters []string) error {
if _, ok := integrations[name]; !ok {
return errors.New("integration not found")
}

// Update filters
activeFilters := viper.GetStringSlice("active_filters")

mergedFilters := append(activeFilters, integrations[name].GetAnalyzerName())

uniqueFilters, dupplicatedFilters := util.RemoveDuplicates(mergedFilters)
Expand Down