chore: merge

Signed-off-by: AlexsJones <alexsimonjones@gmail.com>

pkg/analysis/analysis.go

@@ -160,6 +160,14 @@ func NewAnalysis(
 	return a, nil
 }
 
+func (a *Analysis) CustomAnalyzersAreAvailable() bool {
+	var customAnalyzers []custom.CustomAnalyzer
+	if err := viper.UnmarshalKey("custom_analyzers", &customAnalyzers); err != nil {
+		return false
+	}
+	return len(customAnalyzers) > 0
+}
+
 func (a *Analysis) RunCustomAnalysis() {
 	var customAnalyzers []custom.CustomAnalyzer
 	if err := viper.UnmarshalKey("custom_analyzers", &customAnalyzers); err != nil {
@@ -184,6 +192,12 @@ func (a *Analysis) RunCustomAnalysis() {
 			}
 
 			result, err := canClient.Run()
+			if result.Kind == "" {
+				// for custom analyzer name, we must use a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.',
+				//and must start and end with an alphanumeric character (e.g. 'example.com',
+				//regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*')
+				result.Kind = cAnalyzer.Name
+			}
 			if err != nil {
 				mutex.Lock()
 				a.Errors = append(a.Errors, fmt.Sprintf("[%s] %s", cAnalyzer.Name, err))

pkg/server/analyze.go

@@ -1,10 +1,9 @@
 package server
 
 import (
+	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
 	"context"
 	"encoding/json"
-
-	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/analysis"
 )
 
@@ -39,6 +38,9 @@ func (h *handler) Analyze(ctx context.Context, i *schemav1.AnalyzeRequest) (
 	config.Context = ctx // Replace context for correct timeouts.
 	defer config.Close()
 
+	if config.CustomAnalyzersAreAvailable() {
+		config.RunCustomAnalysis()
+	}
 	config.RunAnalysis()
 
 	if i.Explain {

pkg/server/config.go

@@ -1,11 +1,12 @@
 package server
 
 import (
-	"context"
 	`log`
-
 	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
+	"context"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/custom"
+	"github.com/spf13/viper"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -31,6 +32,38 @@ func (h *handler) AddConfig(ctx context.Context, i *schemav1.AddConfigRequest) (
 		return resp, err
 	}
 
+	if i.CustomAnalyzers != nil {
+		// We need to add the custom analyzers to the viper config and save them
+		var customAnalyzers = make([]custom.CustomAnalyzer, 0)
+		if err := viper.UnmarshalKey("custom_analyzers", &customAnalyzers); err != nil {
+			return resp, err
+		} else {
+			// If there are analyzers are already in the config we will append the ones with new names
+			for _, ca := range i.CustomAnalyzers {
+				exists := false
+				for _, c := range customAnalyzers {
+					if c.Name == ca.Name {
+						exists = true
+						break
+					}
+				}
+				if !exists {
+					customAnalyzers = append(customAnalyzers, custom.CustomAnalyzer{
+						Name: ca.Name,
+						Connection: custom.Connection{
+							Url:  ca.Connection.Url,
+							Port: ca.Connection.Port,
+						},
+					})
+				}
+			}
+			// save the config
+			viper.Set("custom_analyzers", customAnalyzers)
+			if err := viper.WriteConfig(); err != nil {
+				return resp, err
+			}
+		}
+	}
 	if i.Cache != nil {
 		var err error
 		var remoteCache cache.CacheProvider