fix: merged from main

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

cmd/cache/add.go

@@ -24,6 +24,10 @@ import (
 	"github.com/spf13/viper"
 )
 
+var (
+	region string
+)
+
 // addCmd represents the add command
 var addCmd = &cobra.Command{
 	Use:   "add",
@@ -46,6 +50,7 @@ var addCmd = &cobra.Command{
 			os.Exit(1)
 		}
 		cacheInfo.BucketName = bucketname
+		cacheInfo.Region = region
 
 		// Save the cache information
 		viper.Set("cache", cacheInfo)
@@ -59,7 +64,9 @@ var addCmd = &cobra.Command{
 
 func init() {
 	CacheCmd.AddCommand(addCmd)
+	addCmd.Flags().StringVarP(&region, "region", "r", "", "The region to use for the cache")
 	addCmd.Flags().StringVarP(&bucketname, "bucket", "b", "", "The name of the bucket to use for the cache")
 	addCmd.MarkFlagRequired("bucket")
+	addCmd.MarkFlagRequired("region")
 
 }

cmd/cache/remove.go

@@ -15,7 +15,6 @@ limitations under the License.
 package cache
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/fatih/color"
@@ -27,8 +26,8 @@ import (
 // removeCmd represents the remove command
 var removeCmd = &cobra.Command{
 	Use:   "remove",
-	Short: "Remove a remote cache",
-	Long:  `This command allows you to remove a remote cache and use the default filecache.`,
+	Short: "Remove the remote cache",
+	Long:  `This command allows you to remove the remote cache and use the default filecache.`,
 	Run: func(cmd *cobra.Command, args []string) {
 
 		// Remove the remote cache
@@ -43,22 +42,19 @@ var removeCmd = &cobra.Command{
 			os.Exit(1)
 		}
 		// Warn user this will delete the S3 bucket and prompt them to continue
-		color.Yellow("Warning: this will delete the S3 bucket %s", cacheInfo.BucketName)
-		color.Yellow("Are you sure you want to continue? (y/n)")
-		var response string
-		_, err = fmt.Scanln(&response)
+		color.Yellow("Warning: this will not delete the S3 bucket %s", cacheInfo.BucketName)
+		cacheInfo = cache.CacheProvider{}
+		viper.Set("cache", cacheInfo)
+		err = viper.WriteConfig()
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
 		}
-		if response != "y" {
-			os.Exit(0)
-		}
 
+		color.Green("Successfully removed the remote cache")
 	},
 }
 
 func init() {
 	CacheCmd.AddCommand(removeCmd)
-	removeCmd.Flags().StringVarP(&bucketname, "bucket", "b", "", "The name of the bucket to use for the cache")
 }

go.sum

@@ -452,6 +452,8 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-sdk-go v1.44.264 h1:5klL62ebn6uv3oJ0ixF7K12hKItj8lV3QqWeQPlkFSs=
 github.com/aws/aws-sdk-go v1.44.264/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.264 h1:5klL62ebn6uv3oJ0ixF7K12hKItj8lV3QqWeQPlkFSs=
+github.com/aws/aws-sdk-go v1.44.264/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -781,7 +783,6 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=

pkg/cache/cache.go

@@ -24,6 +24,7 @@ func New(noCache bool, remoteCache bool) ICache {
 // CacheProvider is the configuration for the cache provider when using a remote cache
 type CacheProvider struct {
 	BucketName string `mapstructure:"bucketname"`
+	Region     string `mapstructure:"region"`
 }
 
 func RemoteCacheEnabled() (bool, error) {
@@ -33,7 +34,7 @@ func RemoteCacheEnabled() (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	if cache.BucketName != "" {
+	if cache.BucketName != "" && cache.Region != "" {
 		return true, nil
 	}
 	return false, nil

pkg/cache/s3_based.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/spf13/viper"
 )
 
 // Generate ICache implementation
@@ -75,15 +76,43 @@ func (s *S3Cache) IsCacheDisabled() bool {
 
 func NewS3Cache(nocache bool) ICache {
 
-	sess := session.Must(session.NewSession())
-	// Create a new instance of the service's client with a Session.
-	// Optional aws.Config values can also be provided as variadic arguments
-	// to the New function. This option allows you to provide service
-	// specific configuration.
+	var cache CacheProvider
+	err := viper.UnmarshalKey("cache", &cache)
+	if err != nil {
+		panic(err)
+	}
+	if cache.BucketName == "" {
+		panic("Bucket name not configured")
+	}
+	if cache.Region == "" {
+		panic("Region not configured")
+	}
+
+	sess := session.Must(session.NewSessionWithOptions(session.Options{
+		SharedConfigState: session.SharedConfigEnable,
+		Config: aws.Config{
+			Region: aws.String(cache.Region),
+		},
+	}))
+
 	s := s3.New(sess)
 
+	// Check if the bucket exists, if not create it
+	_, err = s.HeadBucket(&s3.HeadBucketInput{
+		Bucket: aws.String(cache.BucketName),
+	})
+	if err != nil {
+		_, err = s.CreateBucket(&s3.CreateBucketInput{
+			Bucket: aws.String(cache.BucketName),
+		})
+		if err != nil {
+			panic(err)
+		}
+	}
+
 	return &S3Cache{
-		noCache: nocache,
-		session: s,
+		noCache:    nocache,
+		session:    s,
+		bucketName: cache.BucketName,
 	}
 }