Skip to content

Commit 241f71a

Browse files
committed
fix linter error
1 parent 7e3e9a6 commit 241f71a

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

internal/scaffold/olm-catalog/descriptor/descriptor_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@ func TestGetKindTypeForAPI(t *testing.T) {
7070
if err := os.Chdir(tfDir); err != nil {
7171
t.Fatal(err)
7272
}
73-
defer os.Chdir(wd)
73+
defer func() {
74+
if err = os.Chdir(wd); err != nil {
75+
t.Fatal(err)
76+
}
77+
}()
7478
tfAPIDir := filepath.Join("pkg", "apis", "cache", "v1alpha1")
7579
universe, err := getTypesFromDir(tfAPIDir)
7680
if err != nil {
@@ -107,7 +111,11 @@ func TestGetCRDDescriptorForGVK(t *testing.T) {
107111
if err := os.Chdir(tfDir); err != nil {
108112
t.Fatal(err)
109113
}
110-
defer os.Chdir(wd)
114+
defer func() {
115+
if err = os.Chdir(wd); err != nil {
116+
t.Fatal(err)
117+
}
118+
}()
111119
xdescsFor := func(paths ...string) (xdescs []string) {
112120
for _, p := range paths {
113121
xdescs = append(xdescs, getSpecXDescriptorsByPath(nil, p)...)

internal/scaffold/olm-catalog/descriptor/parse.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ func sortResources(rs []olmapiv1alpha1.APIResourceReference) []olmapiv1alpha1.AP
6464
return rs
6565
}
6666

67-
func wrapParseErr(err error) error {
68-
return errors.Wrap(err, "error parsing csv-gen annotation")
69-
}
70-
7167
// parseCSVGenAnnotations parses all descriptor annotations from comments,
7268
// each of which should contain one spec.customresourcedefinitions.owned entry.
7369
// field Once all comments have been parsed, the entry is added to a

0 commit comments

Comments
 (0)