Merge branch 'main' into feat/introduce-cfn-mock

Author: nao1215

config/spare/config.go

@@ -6,10 +6,10 @@ import (
 	"io"
 
 	"github.com/charmbracelet/log"
-	"github.com/k1LoW/runn/version"
 	"github.com/nao1215/rainbow/app/domain/model"
 	"github.com/nao1215/rainbow/config"
 	"github.com/nao1215/rainbow/utils/errfmt"
+	"github.com/nao1215/rainbow/version"
 	"github.com/nao1215/spare/utils/xrand"
 	"gopkg.in/yaml.v2"
 )
@@ -60,7 +60,7 @@ func (c *Config) DefaultS3BucketName() model.Bucket {
 	}
 
 	return model.Bucket(
-		fmt.Sprintf("%s-%s-%s", version.Name, c.Region, randomID))
+		fmt.Sprintf("%s-%s-%s", version.GetVersion(), c.Region, randomID))
 }
 
 // Write writes the Config to the io.Writer.

go.mod

@@ -12,13 +12,11 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0
 	github.com/charmbracelet/bubbles v0.17.1
 	github.com/charmbracelet/bubbletea v0.25.0
-	github.com/charmbracelet/lipgloss v0.9.1
 	github.com/charmbracelet/log v0.3.1
 	github.com/fatih/color v1.16.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.5.0
 	github.com/google/wire v0.5.0
-	github.com/k1LoW/runn v0.94.0
 	github.com/muesli/reflow v0.3.0
 	github.com/muesli/termenv v0.15.2
 	github.com/nao1215/gorky v0.2.1
@@ -49,6 +47,7 @@ require (
 	github.com/aws/smithy-go v1.19.0 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/caarlos0/env/v9 v9.0.0 // indirect
+	github.com/charmbracelet/lipgloss v0.9.1 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/google/subcommands v1.0.1 // indirect

go.sum

@@ -85,8 +85,6 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW
 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/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
-github.com/k1LoW/runn v0.94.0 h1:AQqWQoqxG6ymolfJ4E5j6TfdJ132mzP/Two4AhhG1kc=
-github.com/k1LoW/runn v0.94.0/go.mod h1:bx8R87GNqpg+FKTrOU+OCZAAysbAcmr5crHXW4LhYGU=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=