Merge branch 'main' into chore/aws-creds-errors

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

cmd/cache/purge.go

@@ -23,23 +23,51 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var all bool
+
 var purgeCmd = &cobra.Command{
 	Use:   "purge [object name]",
 	Short: "Purge a remote cache",
-	Long:  "This command allows you to delete/purge one object from the cache",
+	Long:  "This command allows you to delete/purge one object from the cache or all objects with --all flag.",
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 0 {
-			color.Red("Error: Please provide a value for object name. Run k8sgpt cache purge --help")
-			os.Exit(1)
-		}
-		objectKey := args[0]
-		fmt.Println(color.YellowString("Purging a remote cache."))
 		c, err := cache.GetCacheConfiguration()
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
 		}
 
+		if all {
+			fmt.Println(color.YellowString("Purging all objects from the remote cache."))
+			names, err := c.List()
+			if err != nil {
+				color.Red("Error listing cache objects: %v", err)
+				os.Exit(1)
+			}
+			if len(names) == 0 {
+				fmt.Println(color.GreenString("No objects to delete."))
+				return
+			}
+			var failed []string
+			for _, obj := range names {
+				err := c.Remove(obj.Name)
+				if err != nil {
+					failed = append(failed, obj.Name)
+				}
+			}
+			if len(failed) > 0 {
+				color.Red("Failed to delete: %v", failed)
+				os.Exit(1)
+			}
+			fmt.Println(color.GreenString("All objects deleted."))
+			return
+		}
+
+		if len(args) == 0 {
+			color.Red("Error: Please provide a value for object name or use --all. Run k8sgpt cache purge --help")
+			os.Exit(1)
+		}
+		objectKey := args[0]
+		fmt.Println(color.YellowString("Purging a remote cache."))
 		err = c.Remove(objectKey)
 		if err != nil {
 			color.Red("Error: %v", err)
@@ -50,5 +78,6 @@ var purgeCmd = &cobra.Command{
 }
 
 func init() {
+	purgeCmd.Flags().BoolVar(&all, "all", false, "Purge all objects in the cache")
 	CacheCmd.AddCommand(purgeCmd)
 }

pkg/ai/amazonbedrock.go

@@ -380,6 +380,9 @@ func (a *AmazonBedRockClient) Configure(config IAIConfig) error {
 			awsconfig.WithRegion(region),
 		)
 		if err != nil {
+			if strings.Contains(err.Error(), "InvalidAccessKeyId") || strings.Contains(err.Error(), "SignatureDoesNotMatch") || strings.Contains(err.Error(), "NoCredentialProviders") {
+				return fmt.Errorf("AWS credentials are invalid or missing. Please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config. Details: %v", err)
+			}
 			return fmt.Errorf("failed to load AWS config for region %s: %w", region, err)
 		}
 
@@ -523,6 +526,9 @@ func (a *AmazonBedRockClient) GetCompletion(ctx context.Context, prompt string)
 	// Invoke the model
 	resp, err := a.client.InvokeModel(ctx, params)
 	if err != nil {
+		if strings.Contains(err.Error(), "InvalidAccessKeyId") || strings.Contains(err.Error(), "SignatureDoesNotMatch") || strings.Contains(err.Error(), "NoCredentialProviders") {
+			return "", fmt.Errorf("AWS credentials are invalid or missing. Please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config. Details: %v", err)
+		}
 		return "", err
 	}
 

pkg/cache/s3_based.go

@@ -3,8 +3,9 @@ package cache
 import (
 	"bytes"
 	"crypto/tls"
-	"log"
+	"errors"
 	"net/http"
+	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -27,16 +28,19 @@ type S3CacheConfiguration struct {
 
 func (s *S3Cache) Configure(cacheInfo CacheProvider) error {
 	if cacheInfo.S3.BucketName == "" {
-		log.Fatal("Bucket name not configured")
+		return errors.New("Bucket name not configured")
 	}
 	s.bucketName = cacheInfo.S3.BucketName
 
-	sess := session.Must(session.NewSessionWithOptions(session.Options{
+	sess, err := session.NewSessionWithOptions(session.Options{
 		SharedConfigState: session.SharedConfigEnable,
 		Config: aws.Config{
 			Region: aws.String(cacheInfo.S3.Region),
 		},
-	}))
+	})
+	if err != nil {
+		return errors.New("Failed to create AWS session. Please check your AWS credentials and configuration: " + err.Error())
+	}
 	if cacheInfo.S3.Endpoint != "" {
 		sess.Config.Endpoint = &cacheInfo.S3.Endpoint
 		sess.Config.S3ForcePathStyle = aws.Bool(true)
@@ -50,10 +54,14 @@ func (s *S3Cache) Configure(cacheInfo CacheProvider) error {
 	s3Client := s3.New(sess)
 
 	// Check if the bucket exists, if not create it
-	_, err := s3Client.HeadBucket(&s3.HeadBucketInput{
+	_, err = s3Client.HeadBucket(&s3.HeadBucketInput{
 		Bucket: aws.String(cacheInfo.S3.BucketName),
 	})
 	if err != nil {
+		// Check for AWS credentials error
+		if strings.Contains(err.Error(), "InvalidAccessKeyId") || strings.Contains(err.Error(), "SignatureDoesNotMatch") || strings.Contains(err.Error(), "NoCredentialProviders") {
+			return errors.New("AWS credentials are invalid or missing. Please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config.")
+		}
 		_, err = s3Client.CreateBucket(&s3.CreateBucketInput{
 			Bucket: aws.String(cacheInfo.S3.BucketName),
 		})