Skip to content

Commit 0edadab

Browse files
joaopapereirajoaopapereira
authored
Fix linter again v7 (#3287)
* Fix linter with multiple main package inside the same folder * Bump version of golangci-lint used Signed-off-by: João Pereira <[email protected]>
1 parent 2353f30 commit 0edadab

File tree

37 files changed

+67
-70
lines changed

37 files changed

+67
-70
lines changed

‎.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: golangci-lint
3838
uses: golangci/golangci-lint-action@v6
3939
with:
40-
version: v1.58
40+
version: v1.61
4141
args: -v --exclude-dirs cf --exclude-dirs fixtures --exclude-dirs plugin --exclude-dirs command/plugin
4242
format:
4343
name: Run go fmt

‎.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ tmp/
5757
fixtures/.cf
5858

5959
#Compiled Plugins
60-
fixtures/plugins/test_1
61-
fixtures/plugins/test_2
62-
fixtures/plugins/empty_plugin
60+
fixtures/plugins/test_1/test_1
61+
fixtures/plugins/test_2/test_2
62+
fixtures/plugins/empty_plugin/empty_plugin
6363
fixtures/config/plugin-config/.cf/plugins/test_1
6464
fixtures/config/plugin-config/.cf/plugins/test_2
6565
fixtures/config/plugin-config/.cf/plugins/empty_plugin

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ units-plugin: install-test-deps
200200

201201
ifeq ($(OS),Windows_NT)
202202
units-non-plugin: install-test-deps
203-
@rm -f $(wildcard fixtures/plugins/*.exe)
203+
@rm -f $(wildcard fixtures/plugins/*/*.exe)
204204
@ginkgo version
205205
CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \
206206
-skip-package integration,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword
207207
else
208208
units-non-plugin: install-test-deps
209-
@rm -f $(wildcard fixtures/plugins/*.exe)
209+
@rm -f $(wildcard fixtures/plugins/*/*.exe)
210210
@ginkgo version
211211
CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \
212212
-skip-package integration,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword

‎cf/commands/plugin/install_plugin_test.go

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ package plugin_test
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"net/http"
76
"net/http/httptest"
87
"os"
98
"path/filepath"
109
"runtime"
11-
"strings"
1210
"sync"
1311

1412
"code.cloudfoundry.org/cli/cf/actors/pluginrepo/pluginrepofakes"
@@ -81,23 +79,23 @@ var _ = Describe("Install", func() {
8179
if err != nil {
8280
panic(err)
8381
}
84-
test_1 = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_1.exe")
85-
test_2 = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_2.exe")
82+
test_1 = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_1", "test_1.exe")
83+
test_2 = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_2", "test_2.exe")
8684
test_curDir = filepath.Join("test_1.exe")
87-
test_with_help = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_with_help.exe")
88-
test_with_orgs = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_with_orgs.exe")
89-
test_with_orgs_short_name = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_with_orgs_short_name.exe")
90-
aliasConflicts = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "alias_conflicts.exe")
85+
test_with_help = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_with_help", "test_with_help.exe")
86+
test_with_orgs = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_with_orgs", "test_with_orgs.exe")
87+
test_with_orgs_short_name = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "test_with_orgs_short_name", "test_with_orgs_short_name.exe")
88+
aliasConflicts = filepath.Join(dir, "..", "..", "..", "fixtures", "plugins", "alias_conflicts", "alias_conflicts.exe")
9189

92-
homeDir, err = ioutil.TempDir(os.TempDir(), "plugins")
90+
homeDir, err = os.MkdirTemp(os.TempDir(), "plugins")
9391
Expect(err).ToNot(HaveOccurred())
9492

9593
pluginDir = filepath.Join(homeDir, ".cf", "plugins")
9694
pluginConfig.GetPluginPathReturns(pluginDir)
9795

9896
curDir, err = os.Getwd()
9997
Expect(err).ToNot(HaveOccurred())
100-
pluginFile, err = ioutil.TempFile("./", "test_plugin")
98+
pluginFile, err = os.CreateTemp("./", "test_plugin")
10199
Expect(err).ToNot(HaveOccurred())
102100

103101
if runtime.GOOS != "windows" {
@@ -542,7 +540,7 @@ var _ = Describe("Install", func() {
542540
runCommand(filepath.Join(curDir, pluginFile.Name()), "-f")
543541
Expect(ui.Outputs()).To(ContainSubstrings(
544542
[]string{"Installing plugin"},
545-
[]string{"The file ", strings.Trim(pluginFile.Name(), "./"), "already exists"},
543+
[]string{"The file", filepath.Clean(pluginFile.Name()), "already exists"},
546544
[]string{"FAILED"},
547545
))
548546
})
@@ -560,7 +558,7 @@ var _ = Describe("Install", func() {
560558
curDir, err := os.Getwd()
561559
Expect(err).ToNot(HaveOccurred())
562560

563-
err = os.Chdir("../../../fixtures/plugins")
561+
err = os.Chdir("../../../fixtures/plugins/test_1")
564562
Expect(err).ToNot(HaveOccurred())
565563

566564
runCommand(test_curDir, "-f")

‎cf/commands/plugin/plugin_suite_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ func TestPlugin(t *testing.T) {
2121

2222
RegisterFailHandler(Fail)
2323

24-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "test_with_help")
25-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "test_with_orgs")
26-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "test_with_orgs_short_name")
27-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "test_with_push")
28-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "test_with_push_short_name")
29-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "test_1")
30-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "test_2")
31-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "empty_plugin")
32-
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins"), "alias_conflicts")
24+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "test_with_help"), "test_with_help")
25+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "test_with_orgs"), "test_with_orgs")
26+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "test_with_orgs_short_name"), "test_with_orgs_short_name")
27+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "test_with_push"), "test_with_push")
28+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "test_with_push_short_name"), "test_with_push_short_name")
29+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "test_1"), "test_1")
30+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "test_2"), "test_2")
31+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "empty_plugin"), "empty_plugin")
32+
pluginbuilder.BuildTestBinary(filepath.Join("..", "..", "..", "fixtures", "plugins", "alias_conflicts"), "alias_conflicts")
3333

3434
RunSpecs(t, "Plugin Suite")
3535
}

‎cf/commands/plugin/plugins_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var _ = Describe("Plugins", func() {
4848
It("computes and prints the sha1 checksum of the binary", func() {
4949
config.PluginsReturns(map[string]pluginconfig.PluginMetadata{
5050
"Test1": {
51-
Location: "../../../fixtures/plugins/test_1.go",
51+
Location: "../../../fixtures/plugins/test_1/test_1.go",
5252
Version: plugin.VersionType{Major: 1, Minor: 2, Build: 3},
5353
Commands: []plugin.Command{
5454
{Name: "test_1_cmd1", HelpText: "help text for test_1_cmd1"},
@@ -157,7 +157,7 @@ var _ = Describe("Plugins", func() {
157157

158158
It("does not list the plugin when it provides no available commands", func() {
159159
config.PluginsReturns(map[string]pluginconfig.PluginMetadata{
160-
"EmptyPlugin": {Location: "../../../fixtures/plugins/empty_plugin.exe"},
160+
"EmptyPlugin": {Location: "../../../fixtures/plugins/empty_plugin/empty_plugin.exe"},
161161
})
162162

163163
runCommand()

‎cf/commands/plugin/uninstall_plugin_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package plugin_test
22

33
import (
4-
"io/ioutil"
54
"os"
65
"path/filepath"
76

@@ -41,7 +40,7 @@ var _ = Describe("Uninstall", func() {
4140
requirementsFactory = new(requirementsfakes.FakeFactory)
4241

4342
var err error
44-
fakePluginRepoDir, err = ioutil.TempDir("", "plugins")
43+
fakePluginRepoDir, err = os.MkdirTemp("", "plugins")
4544
Expect(err).ToNot(HaveOccurred())
4645

4746
fixtureDir := filepath.Join("..", "..", "..", "fixtures", "plugins")
@@ -50,8 +49,8 @@ var _ = Describe("Uninstall", func() {
5049
err = os.MkdirAll(pluginDir, 0700)
5150
Expect(err).NotTo(HaveOccurred())
5251

53-
fileutils.CopyPathToPath(filepath.Join(fixtureDir, "test_1.exe"), filepath.Join(pluginDir, "test_1.exe"))
54-
fileutils.CopyPathToPath(filepath.Join(fixtureDir, "test_2.exe"), filepath.Join(pluginDir, "test_2.exe"))
52+
fileutils.CopyPathToPath(filepath.Join(fixtureDir, "test_1", "test_1.exe"), filepath.Join(pluginDir, "test_1.exe"))
53+
fileutils.CopyPathToPath(filepath.Join(fixtureDir, "test_2", "test_2.exe"), filepath.Join(pluginDir, "test_2.exe"))
5554

5655
confighelpers.PluginRepoDir = func() string {
5756
return fakePluginRepoDir

‎cf/configuration/pluginconfig/plugin_config_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ var _ = Describe("PluginConfig", func() {
8383
}
8484

8585
metadata = PluginMetadata{
86-
Location: "../../../fixtures/plugins/test_1.exe",
86+
Location: "../../../fixtures/plugins/test_1/test_1.exe",
8787
Commands: commands1,
8888
}
8989
})
@@ -110,9 +110,9 @@ var _ = Describe("PluginConfig", func() {
110110
})
111111

112112
It("returns a list of plugin executables and their location", func() {
113-
Expect(plugins["Test1"].Location).To(Equal("../../../fixtures/plugins/test_1.exe"))
113+
Expect(plugins["Test1"].Location).To(Equal("../../../fixtures/plugins/test_1/test_1.exe"))
114114
Expect(plugins["Test1"].Commands).To(Equal(commands1))
115-
Expect(plugins["Test2"].Location).To(Equal("../../../fixtures/plugins/test_2.exe"))
115+
Expect(plugins["Test2"].Location).To(Equal("../../../fixtures/plugins/test_2/test_2.exe"))
116116
Expect(plugins["Test2"].Commands).To(Equal(commands2))
117117
})
118118
})

‎fixtures/config/help-plugin-test-config/.cf/plugins/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"Plugins": {
33
"Test1":{
4-
"Location":"../../fixtures/plugins/test_1.exe",
4+
"Location":"../../fixtures/plugins/test_1/test_1.exe",
55
"Commands":[
66
{"Name":"test1_cmd1","Alias":"test1_cmd1_alias","HelpText":"help text for test1 cmd1"},
77
{"Name":"test1_cmd2","HelpText":"help text for test1 cmd2"}
88
]
99
},
1010
"Test2":{
11-
"Location":"../../fixtures/plugins/test_2.exe",
11+
"Location":"../../fixtures/plugins/test_2/test_2.exe",
1212
"Commands":[
1313
{"Name":"test2_cmd1","Alias":"tc1","HelpText":"help text for test2 cmd1"},
1414
{"Name":"test2_cmd2","HelpText":"help text for test2 cmd2"},

‎fixtures/config/plugin-config/.cf/plugins/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"Plugins": {
33
"Test1":{
4-
"Location":"../../../fixtures/plugins/test_1.exe",
4+
"Location":"../../../fixtures/plugins/test_1/test_1.exe",
55
"Commands":[
66
{"Name":"test_1_cmd1","HelpText":"help text for test1 cmd1"},
77
{"Name":"test_1_cmd2","HelpText":"help text for test1 cmd2"}
88
]
99
},
1010
"Test2":{
11-
"Location":"../../../fixtures/plugins/test_2.exe",
11+
"Location":"../../../fixtures/plugins/test_2/test_2.exe",
1212
"Commands":[
1313
{"Name":"test_2_cmd1","HelpText":"help text for test2 cmd1"},
1414
{"Name":"test_2_cmd2","HelpText":"help text for test2 cmd2"}

0 commit comments

Comments
 (0)