Skip to content

Commit e61d4af

Browse files
christophwitzkochristophwitzko
committed
refactor: rename PluginInfo struct to Info
1 parent 25a96d4 commit e61d4af

File tree

10 files changed

+24
-23
lines changed

10 files changed

+24
-23
lines changed

‎pkg/plugin/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func KillAllPlugins() {
2727
}
2828
}
2929

30-
func StartPlugin(pluginInfo *PluginInfo) (interface{}, error) {
30+
func StartPlugin(pluginInfo *Info) (interface{}, error) {
3131
runningClientsMx.Lock()
3232
defer runningClientsMx.Unlock()
3333
logR, logW := io.Pipe()

‎pkg/plugin/discovery/discovery.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func New(config *config.Config) (*Discovery, error) {
5050
}, nil
5151
}
5252

53-
func (d *Discovery) fetchPlugin(pluginInfo *plugin.PluginInfo) (string, error) {
53+
func (d *Discovery) fetchPlugin(pluginInfo *plugin.Info) (string, error) {
5454
pluginResolver, ok := d.resolvers[pluginInfo.Resolver]
5555
if !ok {
5656
return "", fmt.Errorf("resolver %s not found", pluginInfo.Resolver)
@@ -64,7 +64,7 @@ func (d *Discovery) fetchPlugin(pluginInfo *plugin.PluginInfo) (string, error) {
6464
return downloadPlugin(pluginInfo, downloadInfo, d.config.ShowProgress)
6565
}
6666

67-
func (d *Discovery) FindPlugin(t, name string) (*plugin.PluginInfo, error) {
67+
func (d *Discovery) FindPlugin(t, name string) (*plugin.Info, error) {
6868
pInfo, err := plugin.GetPluginInfo(t, name)
6969
if err != nil {
7070
return nil, err

‎pkg/plugin/discovery/download.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func extractFileFromTarGz(name, inputFile, outputFile string) error {
9090

9191
var tgzRegexp = regexp.MustCompile(`^(.*)\.(tgz|tar\.gz)$`)
9292

93-
func downloadPlugin(pluginInfo *plugin.PluginInfo, downloadInfo *resolver.PluginDownloadInfo, showProgress bool) (string, error) {
93+
func downloadPlugin(pluginInfo *plugin.Info, downloadInfo *resolver.PluginDownloadInfo, showProgress bool) (string, error) {
9494
versionDir := path.Join(pluginInfo.PluginPath, downloadInfo.Version)
9595
targetFile := path.Join(versionDir, downloadInfo.FileName)
9696
req, err := grab.NewRequest(targetFile, downloadInfo.URL)

‎pkg/plugin/discovery/local.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const PluginDir = ".semrel"
1616

1717
var osArchDir = runtime.GOOS + "_" + runtime.GOARCH
1818

19-
func setAndEnsurePluginPath(pluginInfo *plugin.PluginInfo) error {
19+
func setAndEnsurePluginPath(pluginInfo *plugin.Info) error {
2020
pluginPath := path.Join(PluginDir, osArchDir, pluginInfo.NormalizedName)
2121
if _, err := os.Stat(pluginPath); os.IsNotExist(err) {
2222
err = os.MkdirAll(pluginPath, 0o755)
@@ -32,7 +32,7 @@ func setAndEnsurePluginPath(pluginInfo *plugin.PluginInfo) error {
3232

3333
var ErrPluginNotFound = errors.New("no plugin was found")
3434

35-
func getMatchingVersionDir(pluginInfo *plugin.PluginInfo) (string, error) {
35+
func getMatchingVersionDir(pluginInfo *plugin.Info) (string, error) {
3636
vDirs, err := os.ReadDir(pluginInfo.PluginPath)
3737
if err != nil {
3838
return "", err
@@ -65,7 +65,7 @@ func getMatchingVersionDir(pluginInfo *plugin.PluginInfo) (string, error) {
6565
return "", nil
6666
}
6767

68-
func findPluginLocally(pluginInfo *plugin.PluginInfo) (string, error) {
68+
func findPluginLocally(pluginInfo *plugin.Info) (string, error) {
6969
vPth, err := getMatchingVersionDir(pluginInfo)
7070
if err != nil {
7171
return "", err

‎pkg/plugin/discovery/resolver/github/github.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (g *Resolver) getAllValidGitHubReleases(repoOwner, repoName string) (ghRele
119119
return ret, nil
120120
}
121121

122-
func (g *Resolver) ResolvePlugin(pluginInfo *plugin.PluginInfo) (*resolver.PluginDownloadInfo, error) {
122+
func (g *Resolver) ResolvePlugin(pluginInfo *plugin.Info) (*resolver.PluginDownloadInfo, error) {
123123
if pluginInfo.RepoSlug == "" {
124124
pluginInfo.RepoSlug = knownPlugins[pluginInfo.ShortNormalizedName]
125125
}

‎pkg/plugin/discovery/resolver/registry/registry.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func NewResolver() *Resolver {
1717
return &Resolver{}
1818
}
1919

20-
func (r *Resolver) ResolvePlugin(pluginInfo *plugin.PluginInfo) (*resolver.PluginDownloadInfo, error) {
20+
func (r *Resolver) ResolvePlugin(pluginInfo *plugin.Info) (*resolver.PluginDownloadInfo, error) {
2121
pluginAPIRes, err := getPluginInfo(pluginInfo.NormalizedName)
2222
if err != nil {
2323
return nil, err

‎pkg/plugin/discovery/resolver/resolver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ type PluginDownloadInfo struct {
1010
}
1111

1212
type Resolver interface {
13-
ResolvePlugin(*plugin.PluginInfo) (*PluginDownloadInfo, error)
13+
ResolvePlugin(*plugin.Info) (*PluginDownloadInfo, error)
1414
Names() []string
1515
}

‎pkg/plugin/plugin.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/go-semantic-release/semantic-release/v2/pkg/updater"
1414
)
1515

16-
type PluginInfo struct {
16+
type Info struct {
1717
Type string
1818
Name string
1919
NormalizedName string
@@ -45,7 +45,7 @@ func normalizedPluginType(t string) string {
4545

4646
var nameNormalizer = strings.NewReplacer(":", "-", "/", "-")
4747

48-
func GetPluginInfo(pluginType, pluginName string) (*PluginInfo, error) {
48+
func GetPluginInfo(pluginType, pluginName string) (*Info, error) {
4949
nPluginType := normalizedPluginType(pluginType)
5050
if nPluginType == "" {
5151
return nil, fmt.Errorf("invalid plugin type: %s", pluginType)
@@ -96,7 +96,7 @@ func GetPluginInfo(pluginType, pluginName string) (*PluginInfo, error) {
9696
normalizedName = strings.Join(normalizedParts[:len(normalizedParts)-1], "@")
9797
}
9898

99-
return &PluginInfo{
99+
return &Info{
100100
Type: pluginType,
101101
Name: name,
102102
NormalizedName: normalizedName,

‎pkg/plugin/plugin_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,32 @@ func TestGetPluginInfo(t *testing.T) {
1717
testCases := []struct {
1818
t string
1919
input string
20-
results *PluginInfo
20+
results *Info
2121
}{
22-
{"provider", "git", &PluginInfo{
22+
{"provider", "git", &Info{
2323
Type: "provider",
2424
Name: "git",
2525
NormalizedName: "provider-git",
2626
ShortNormalizedName: "provider-git",
2727
Resolver: "default",
2828
}},
29-
{"provider", "github:myorg/myplugin", &PluginInfo{
29+
{"provider", "github:myorg/myplugin", &Info{
3030
Type: "provider",
3131
Name: "myplugin",
3232
NormalizedName: "provider-github-myorg-myplugin",
3333
ShortNormalizedName: "provider-myplugin",
3434
Resolver: "github",
3535
RepoSlug: "myorg/myplugin",
3636
}},
37-
{"ci_condition", "github:myorg/myplugin", &PluginInfo{
37+
{"ci_condition", "github:myorg/myplugin", &Info{
3838
Type: "ci_condition",
3939
Name: "myplugin",
4040
NormalizedName: "condition-github-myorg-myplugin",
4141
ShortNormalizedName: "condition-myplugin",
4242
Resolver: "github",
4343
RepoSlug: "myorg/myplugin",
4444
}},
45-
{"provider", "github:myorg/myplugin@^1.0.0", &PluginInfo{
45+
{"provider", "github:myorg/myplugin@^1.0.0", &Info{
4646
Type: "provider",
4747
Name: "myplugin",
4848
NormalizedName: "provider-github-myorg-myplugin",
@@ -51,30 +51,30 @@ func TestGetPluginInfo(t *testing.T) {
5151
RepoSlug: "myorg/myplugin",
5252
Constraint: parseConstraint("^1.0.0"),
5353
}},
54-
{"provider", "git@2.0.0", &PluginInfo{
54+
{"provider", "git@2.0.0", &Info{
5555
Type: "provider",
5656
Name: "git",
5757
NormalizedName: "provider-git",
5858
ShortNormalizedName: "provider-git",
5959
Resolver: "default",
6060
Constraint: parseConstraint("2.0.0"),
6161
}},
62-
{"hooks", "registry:logger", &PluginInfo{
62+
{"hooks", "registry:logger", &Info{
6363
Type: "hooks",
6464
Name: "logger",
6565
NormalizedName: "hooks-registry-logger",
6666
ShortNormalizedName: "hooks-logger",
6767
Resolver: "registry",
6868
}},
69-
{"hooks", "myresolver:@myorg/myplugin", &PluginInfo{
69+
{"hooks", "myresolver:@myorg/myplugin", &Info{
7070
Type: "hooks",
7171
Name: "myplugin",
7272
NormalizedName: "hooks-myresolver-@myorg-myplugin",
7373
ShortNormalizedName: "hooks-myplugin",
7474
Resolver: "myresolver",
7575
RepoSlug: "@myorg/myplugin",
7676
}},
77-
{"hooks", "myresolver:@myorg/myplugin@1.2.3", &PluginInfo{
77+
{"hooks", "myresolver:@myorg/myplugin@1.2.3", &Info{
7878
Type: "hooks",
7979
Name: "myplugin",
8080
NormalizedName: "hooks-myresolver-@myorg-myplugin",

‎pkg/semrel/semrel.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ func calculateChange(commits []*Commit, latestRelease *Release) *Change {
2222
return change
2323
}
2424

25-
func applyChange(rawVersion string, rawChange *Change, allowInitialDevelopmentVersions bool, forceBumpPatchVersion bool) string {
25+
//gocyclo:ignore
26+
func applyChange(rawVersion string, rawChange *Change, allowInitialDevelopmentVersions, forceBumpPatchVersion bool) string {
2627
version := semver.MustParse(rawVersion)
2728
change := &Change{
2829
Major: rawChange.Major,

0 commit comments

Comments
 (0)