-
Notifications
You must be signed in to change notification settings - Fork 715
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-concurrent-map-write
- Loading branch information
Showing
22 changed files
with
749 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
{".":"0.3.39"} | ||
{".":"0.3.40"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
Copyright 2023 The K8sGPT Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package customanalyzer | ||
|
||
import ( | ||
"os" | ||
|
||
"github.com/fatih/color" | ||
customAnalyzer "github.com/k8sgpt-ai/k8sgpt/pkg/custom_analyzer" | ||
"github.com/spf13/cobra" | ||
"github.com/spf13/viper" | ||
) | ||
|
||
var ( | ||
name string | ||
url string | ||
port int | ||
) | ||
|
||
var addCmd = &cobra.Command{ | ||
Use: "add", | ||
Aliases: []string{"add"}, | ||
Short: "This command will add a custom analyzer from source", | ||
Long: "This command allows you to add/remote/list an existing custom analyzer.", | ||
Run: func(cmd *cobra.Command, args []string) { | ||
err := viper.UnmarshalKey("custom_analyzers", &configCustomAnalyzer) | ||
if err != nil { | ||
color.Red("Error: %v", err) | ||
os.Exit(1) | ||
} | ||
analyzer := customAnalyzer.NewCustomAnalyzer() | ||
|
||
// Check if configuration is valid | ||
err = analyzer.Check(configCustomAnalyzer, name, url, port) | ||
if err != nil { | ||
color.Red("Error adding custom analyzer: %s", err.Error()) | ||
os.Exit(1) | ||
} | ||
|
||
configCustomAnalyzer = append(configCustomAnalyzer, customAnalyzer.CustomAnalyzerConfiguration{ | ||
Name: name, | ||
Connection: customAnalyzer.Connection{ | ||
Url: url, | ||
Port: port, | ||
}, | ||
}) | ||
|
||
viper.Set("custom_analyzers", configCustomAnalyzer) | ||
if err := viper.WriteConfig(); err != nil { | ||
color.Red("Error writing config file: %s", err.Error()) | ||
os.Exit(1) | ||
} | ||
color.Green("%s added to the custom analyzers config list", name) | ||
|
||
}, | ||
} | ||
|
||
func init() { | ||
addCmd.Flags().StringVarP(&name, "name", "n", "my-custom-analyzer", "Name of the custom analyzer.") | ||
addCmd.Flags().StringVarP(&url, "url", "u", "localhost", "URL for the custom analyzer connection.") | ||
addCmd.Flags().IntVarP(&port, "port", "r", 8085, "Port for the custom analyzer connection.") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
Copyright 2023 The K8sGPT Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package customanalyzer | ||
|
||
import ( | ||
customAnalyzer "github.com/k8sgpt-ai/k8sgpt/pkg/custom_analyzer" | ||
"github.com/spf13/cobra" | ||
) | ||
|
||
var configCustomAnalyzer []customAnalyzer.CustomAnalyzerConfiguration | ||
|
||
// authCmd represents the auth command | ||
var CustomAnalyzerCmd = &cobra.Command{ | ||
Use: "custom-analyzer", | ||
Short: "Manage a custom analyzer", | ||
Long: `This command allows you to manage custom analyzers, including adding, removing, and listing them.`, | ||
Run: func(cmd *cobra.Command, args []string) { | ||
if len(args) == 0 { | ||
_ = cmd.Help() | ||
return | ||
} | ||
}, | ||
} | ||
|
||
func init() { | ||
// add subcommand to add custom analyzer | ||
CustomAnalyzerCmd.AddCommand(addCmd) | ||
// remove subcomment to remove custom analyzer | ||
CustomAnalyzerCmd.AddCommand(removeCmd) | ||
// list subcomment to list custom analyzer | ||
CustomAnalyzerCmd.AddCommand(listCmd) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
Copyright 2023 The K8sGPT Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package customanalyzer | ||
|
||
import ( | ||
"fmt" | ||
"os" | ||
|
||
"github.com/fatih/color" | ||
customAnalyzer "github.com/k8sgpt-ai/k8sgpt/pkg/custom_analyzer" | ||
"github.com/spf13/cobra" | ||
"github.com/spf13/viper" | ||
) | ||
|
||
var details bool | ||
|
||
var listCmd = &cobra.Command{ | ||
Use: "list", | ||
Short: "List configured custom analyzers", | ||
Long: "The list command displays a list of configured custom analyzers", | ||
Run: func(cmd *cobra.Command, args []string) { | ||
|
||
// get custom_analyzers configuration | ||
err := viper.UnmarshalKey("custom_analyzers", &configCustomAnalyzer) | ||
if err != nil { | ||
color.Red("Error: %v", err) | ||
os.Exit(1) | ||
} | ||
|
||
// Get list of all Custom Analyers configured | ||
fmt.Print(color.YellowString("Active: \n")) | ||
for _, analyzer := range configCustomAnalyzer { | ||
fmt.Printf("> %s\n", color.GreenString(analyzer.Name)) | ||
if details { | ||
printDetails(analyzer) | ||
} | ||
} | ||
}, | ||
} | ||
|
||
func init() { | ||
listCmd.Flags().BoolVar(&details, "details", false, "Print custom analyzers configuration details") | ||
} | ||
|
||
func printDetails(analyzer customAnalyzer.CustomAnalyzerConfiguration) { | ||
fmt.Printf(" - Url: %s\n", analyzer.Connection.Url) | ||
fmt.Printf(" - Port: %d\n", analyzer.Connection.Port) | ||
|
||
} |
Oops, something went wrong.