From bb26419e248020e58ed469aae5043466c3a103db Mon Sep 17 00:00:00 2001 From: Walter Scott Date: Wed, 22 Nov 2023 06:26:04 -0600 Subject: [PATCH] dont fetch tags all the time --- cmd/simver_github_actions/main.go | 2 +- gitexec/actions.go | 2 +- gitexec/local.go | 2 +- gitexec/tag.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- simver.go | 7 +------ tags.go | 4 ++-- 8 files changed, 11 insertions(+), 16 deletions(-) diff --git a/cmd/simver_github_actions/main.go b/cmd/simver_github_actions/main.go index 6eacb15..fc7dd84 100644 --- a/cmd/simver_github_actions/main.go +++ b/cmd/simver_github_actions/main.go @@ -16,7 +16,7 @@ func main() { ctx := context.Background() - ctx = szl.NewVerboseLoggerContext(ctx) + ctx = szl.NewVerboseConsoleLogger().WithContext(ctx) zerolog.SetGlobalLevel(zerolog.DebugLevel) diff --git a/gitexec/actions.go b/gitexec/actions.go index 8f5f985..4bc029b 100644 --- a/gitexec/actions.go +++ b/gitexec/actions.go @@ -10,7 +10,7 @@ import ( "github.com/walteh/simver" ) -func BuildGitHubActionsProviders() (simver.GitProvider, simver.TagProvider, simver.TagWriter, simver.PRProvider, simver.PRResolver, error) { +func BuildGitHubActionsProviders() (simver.GitProvider, simver.TagReader, simver.TagWriter, simver.PRProvider, simver.PRResolver, error) { token := os.Getenv("GITHUB_TOKEN") repoPath := os.Getenv("GITHUB_WORKSPACE") diff --git a/gitexec/local.go b/gitexec/local.go index 7bf580d..e6d8e4b 100644 --- a/gitexec/local.go +++ b/gitexec/local.go @@ -9,7 +9,7 @@ import ( "github.com/walteh/simver" ) -func BuildLocalProviders(fls afero.Fs) (simver.GitProvider, simver.TagProvider, simver.TagWriter, simver.PRResolver, error) { +func BuildLocalProviders(fls afero.Fs) (simver.GitProvider, simver.TagReader, simver.TagWriter, simver.PRResolver, error) { repoData, err := fls.Open(".git/config") if err != nil { diff --git a/gitexec/tag.go b/gitexec/tag.go index 406f0ed..129cb6f 100644 --- a/gitexec/tag.go +++ b/gitexec/tag.go @@ -13,8 +13,8 @@ import ( ) var ( - _ simver.TagProvider = (*gitProvider)(nil) - _ simver.TagWriter = (*gitProvider)(nil) + _ simver.TagReader = (*gitProvider)(nil) + _ simver.TagWriter = (*gitProvider)(nil) ) func (p *gitProvider) TagsFromCommit(ctx context.Context, commitHash string) (simver.Tags, error) { diff --git a/go.mod b/go.mod index 088be65..a73a38d 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/rs/zerolog v1.31.0 github.com/spf13/afero v1.10.0 github.com/stretchr/testify v1.8.4 - github.com/walteh/snake v0.0.0-simver-test-b + github.com/walteh/snake v0.25.0 github.com/walteh/terrors v0.2.6 golang.org/x/mod v0.14.0 ) diff --git a/go.sum b/go.sum index d4d48df..1b586a6 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/walteh/snake v0.0.0-simver-test-b h1:tDW9kgZEFv9IpH9TKVHl0q0extqLf1iTzQwE6S+knWg= -github.com/walteh/snake v0.0.0-simver-test-b/go.mod h1:2CyOw00AbrujT3hhI0CPQWQnYP/9NF9s9y3HmTQtDDs= +github.com/walteh/snake v0.25.0 h1:NdrmTpgclunv5uOUSsU3oyxXZ+LVgKRIz69syhWLwag= +github.com/walteh/snake v0.25.0/go.mod h1:2CyOw00AbrujT3hhI0CPQWQnYP/9NF9s9y3HmTQtDDs= github.com/walteh/terrors v0.2.6 h1:bluJszqQIEVldxU4Ur9GaOLEaVKLdWwuFW8dwKRzHhw= github.com/walteh/terrors v0.2.6/go.mod h1:txmqqCK7EbLSUFRXzsRDR8b9oDMX6aywzRSGKiQOdEQ= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/simver.go b/simver.go index b8781d2..63fc5cb 100644 --- a/simver.go +++ b/simver.go @@ -82,18 +82,13 @@ func (e *ActiveProjectState) HeadCommitTags() Tags { return e.CurrentHeadCommitTags } -func LoadExecution(ctx context.Context, tprov TagProvider, prr PRResolver) (Execution, *PRDetails, error) { +func LoadExecution(ctx context.Context, tprov TagReader, prr PRResolver) (Execution, *PRDetails, error) { pr, err := prr.CurrentPR(ctx) if err != nil { return nil, nil, err } - _, err = tprov.FetchTags(ctx) - if err != nil { - return nil, nil, err - } - baseCommitTags, err := tprov.TagsFromCommit(ctx, pr.BaseCommit) if err != nil { return nil, nil, err diff --git a/tags.go b/tags.go index 2af041b..8fced29 100644 --- a/tags.go +++ b/tags.go @@ -9,14 +9,14 @@ import ( "golang.org/x/mod/semver" ) -type TagProvider interface { - FetchTags(ctx context.Context) (Tags, error) +type TagReader interface { TagsFromCommit(ctx context.Context, commitHash string) (Tags, error) TagsFromBranch(ctx context.Context, branch string) (Tags, error) } type TagWriter interface { CreateTags(ctx context.Context, tag ...Tag) error + FetchTags(ctx context.Context) (Tags, error) } type Tag struct {