Skip to content

Commit 087ad86

Browse files
committed
fix: golangci-lint passes against a new project
Previously: deadcode (via golangci-lint) reported: ``` controllers/suite_test.go:23:5: `cfg` is unused (deadcode) var cfg *rest.Config ^ ``` errcheck (via golangci-lint) reported: ``` main.go:27:26: Error return value of `nrdbv1alpha1.AddToScheme` is not checked (errcheck) nrdbv1alpha1.AddToScheme(scheme) ^ ``` Also add a guardrail or two to the generated_golden.sh script, as it was not immediately obvious what to do about tar's complaint that it couldn't recognize the file format.
1 parent ef5d3c4 commit 087ad86

File tree

5 files changed

+16
-7
lines changed

5 files changed

+16
-7
lines changed

generated_golden.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ scaffold_test_project() {
3333
testdata_dir=$(pwd)/testdata
3434
mkdir -p ./testdata/$project
3535
rm -rf ./testdata/$project/*
36-
pushd .
36+
pushd .
3737
cd testdata/$project
3838

3939
kb=$testdata_dir/../bin/kubebuilder
@@ -79,6 +79,13 @@ scaffold_test_project() {
7979
}
8080

8181
set -e
82+
83+
if ! git lfs > /dev/null 2>&1 ; then
84+
echo "this project requires git-lfs, see: https://git-lfs.github.com/"
85+
echo "after installing, you'll need to git checkout ./testdata/*tgz"
86+
exit 1
87+
fi
88+
8289
build_kb
8390
scaffold_test_project gopath/src/project 1
8491
scaffold_test_project project-v2 2

pkg/scaffold/v2/controller_suitetest.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ var _ = BeforeSuite(func(done Done) {
103103
testEnv = &envtest.Environment{
104104
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
105105
}
106-
107-
cfg, err := testEnv.Start()
106+
107+
var err error
108+
cfg, err = testEnv.Start()
108109
Expect(err).ToNot(HaveOccurred())
109110
Expect(cfg).ToNot(BeNil())
110111

pkg/scaffold/v2/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (m *Main) Update(opts *MainUpdateOptions) error {
6262
`, opts.Resource.Group, opts.Resource.Version, resPkg, opts.Resource.Version)
6363
ctrlImportCodeFragment := fmt.Sprintf(`"%s/controllers"
6464
`, opts.Project.Repo)
65-
addschemeCodeFragment := fmt.Sprintf(`%s%s.AddToScheme(scheme)
65+
addschemeCodeFragment := fmt.Sprintf(`_ = %s%s.AddToScheme(scheme)
6666
`, opts.Resource.Group, opts.Resource.Version)
6767
reconcilerSetupCodeFragment := fmt.Sprintf(`err = (&controllers.%sReconciler{
6868
Client: mgr.GetClient(),

testdata/project-v2/controllers/suite_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ var _ = BeforeSuite(func(done Done) {
5757
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
5858
}
5959

60-
cfg, err := testEnv.Start()
60+
var err error
61+
cfg, err = testEnv.Start()
6162
Expect(err).ToNot(HaveOccurred())
6263
Expect(cfg).ToNot(BeNil())
6364

testdata/project-v2/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ var (
3737

3838
func init() {
3939

40-
crewv1.AddToScheme(scheme)
41-
corev1.AddToScheme(scheme)
40+
_ = crewv1.AddToScheme(scheme)
41+
_ = corev1.AddToScheme(scheme)
4242
// +kubebuilder:scaffold:scheme
4343
}
4444

0 commit comments

Comments
 (0)