Skip to content

Commit c9b89f3

Browse files
author
Per Goncalves da Silva
committed
Fix crd-generator tests
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 1e51555 commit c9b89f3

File tree

3 files changed

+85
-83
lines changed

3 files changed

+85
-83
lines changed

‎hack/tools/crd-generator/main_test.go‎

Lines changed: 83 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,106 @@
11
package main
22

33
import (
4-
"fmt"
5-
"io"
6-
"os"
7-
"path/filepath"
8-
"testing"
4+
"fmt"
5+
"io"
6+
"os"
7+
"path/filepath"
8+
"testing"
99

10-
"github.com/stretchr/testify/require"
10+
"github.com/stretchr/testify/require"
1111
)
1212

13+
const controllerToolsVersion = "v0.19.0"
14+
1315
func TestRunGenerator(t *testing.T) {
14-
here, err := os.Getwd()
15-
require.NoError(t, err)
16-
// Get to repo root
17-
err = os.Chdir("../../..")
18-
require.NoError(t, err)
19-
defer func() {
20-
_ = os.Chdir(here)
21-
}()
22-
dir, err := os.MkdirTemp("", "crd-generate-*")
23-
require.NoError(t, err)
24-
defer os.RemoveAll(dir)
25-
require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
26-
require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
27-
runGenerator(dir, "v0.18.0")
16+
here, err := os.Getwd()
17+
require.NoError(t, err)
18+
// Get to repo root
19+
err = os.Chdir("../../..")
20+
require.NoError(t, err)
21+
defer func() {
22+
_ = os.Chdir(here)
23+
}()
24+
dir, err := os.MkdirTemp("", "crd-generate-*")
25+
require.NoError(t, err)
26+
defer os.RemoveAll(dir)
27+
require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
28+
require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
29+
runGenerator(dir, controllerToolsVersion)
2830

29-
f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
30-
f2 := "config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml"
31-
fmt.Printf("comparing: %s to %s\n", f1, f2)
32-
compareFiles(t, f1, f2)
31+
f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
32+
f2 := "config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml"
33+
fmt.Printf("comparing: %s to %s\n", f1, f2)
34+
compareFiles(t, f1, f2)
3335

34-
f1 = filepath.Join(dir, "standard/olm.operatorframework.io_clustercatalogs.yaml")
35-
f2 = "config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"
36-
fmt.Printf("comparing: %s to %s\n", f1, f2)
37-
compareFiles(t, f1, f2)
36+
f1 = filepath.Join(dir, "standard/olm.operatorframework.io_clustercatalogs.yaml")
37+
f2 = "config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"
38+
fmt.Printf("comparing: %s to %s\n", f1, f2)
39+
compareFiles(t, f1, f2)
3840

39-
f1 = filepath.Join(dir, "experimental/olm.operatorframework.io_clusterextensions.yaml")
40-
f2 = "config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml"
41-
fmt.Printf("comparing: %s to %s\n", f1, f2)
42-
compareFiles(t, f1, f2)
41+
f1 = filepath.Join(dir, "experimental/olm.operatorframework.io_clusterextensions.yaml")
42+
f2 = "config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml"
43+
fmt.Printf("comparing: %s to %s\n", f1, f2)
44+
compareFiles(t, f1, f2)
4345

44-
f1 = filepath.Join(dir, "experimental/olm.operatorframework.io_clustercatalogs.yaml")
45-
f2 = "config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml"
46-
fmt.Printf("comparing: %s to %s\n", f1, f2)
47-
compareFiles(t, f1, f2)
46+
f1 = filepath.Join(dir, "experimental/olm.operatorframework.io_clustercatalogs.yaml")
47+
f2 = "config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml"
48+
fmt.Printf("comparing: %s to %s\n", f1, f2)
49+
compareFiles(t, f1, f2)
4850
}
4951

5052
func TestTags(t *testing.T) {
51-
here, err := os.Getwd()
52-
require.NoError(t, err)
53-
err = os.Chdir("testdata")
54-
defer func() {
55-
_ = os.Chdir(here)
56-
}()
57-
require.NoError(t, err)
58-
dir, err := os.MkdirTemp("", "crd-generate-*")
59-
require.NoError(t, err)
60-
defer os.RemoveAll(dir)
61-
require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
62-
require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
63-
runGenerator(dir, "v0.18.0", "github.com/operator-framework/operator-controller/hack/tools/crd-generator/testdata/api/v1")
53+
here, err := os.Getwd()
54+
require.NoError(t, err)
55+
err = os.Chdir("testdata")
56+
defer func() {
57+
_ = os.Chdir(here)
58+
}()
59+
require.NoError(t, err)
60+
dir, err := os.MkdirTemp("", "crd-generate-*")
61+
require.NoError(t, err)
62+
defer os.RemoveAll(dir)
63+
require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
64+
require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
65+
runGenerator(dir, controllerToolsVersion, "github.com/operator-framework/operator-controller/hack/tools/crd-generator/testdata/api/v1")
6466

65-
f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
66-
f2 := "output/standard/olm.operatorframework.io_clusterextensions.yaml"
67-
fmt.Printf("comparing: %s to %s\n", f1, f2)
68-
compareFiles(t, f1, f2)
67+
f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
68+
f2 := "output/standard/olm.operatorframework.io_clusterextensions.yaml"
69+
fmt.Printf("comparing: %s to %s\n", f1, f2)
70+
compareFiles(t, f1, f2)
6971

70-
f1 = filepath.Join(dir, "experimental/olm.operatorframework.io_clusterextensions.yaml")
71-
f2 = "output/experimental/olm.operatorframework.io_clusterextensions.yaml"
72-
fmt.Printf("comparing: %s to %s\n", f1, f2)
73-
compareFiles(t, f1, f2)
72+
f1 = filepath.Join(dir, "experimental/olm.operatorframework.io_clusterextensions.yaml")
73+
f2 = "output/experimental/olm.operatorframework.io_clusterextensions.yaml"
74+
fmt.Printf("comparing: %s to %s\n", f1, f2)
75+
compareFiles(t, f1, f2)
7476
}
7577

7678
func compareFiles(t *testing.T, file1, file2 string) {
77-
f1, err := os.Open(file1)
78-
require.NoError(t, err)
79-
defer func() {
80-
_ = f1.Close()
81-
}()
79+
f1, err := os.Open(file1)
80+
require.NoError(t, err)
81+
defer func() {
82+
_ = f1.Close()
83+
}()
8284

83-
f2, err := os.Open(file2)
84-
require.NoError(t, err)
85-
defer func() {
86-
_ = f2.Close()
87-
}()
85+
f2, err := os.Open(file2)
86+
require.NoError(t, err)
87+
defer func() {
88+
_ = f2.Close()
89+
}()
8890

89-
for {
90-
b1 := make([]byte, 64000)
91-
b2 := make([]byte, 64000)
92-
n1, err1 := f1.Read(b1)
93-
n2, err2 := f2.Read(b2)
91+
for {
92+
b1 := make([]byte, 64000)
93+
b2 := make([]byte, 64000)
94+
n1, err1 := f1.Read(b1)
95+
n2, err2 := f2.Read(b2)
9496

95-
// Success if both have EOF at the same time
96-
if err1 == io.EOF && err2 == io.EOF {
97-
return
98-
}
99-
require.NoError(t, err1)
100-
require.NoError(t, err2)
101-
require.Equal(t, n1, n2)
102-
require.Equal(t, b1, b2)
103-
}
97+
// Success if both have EOF at the same time
98+
if err1 == io.EOF && err2 == io.EOF {
99+
return
100+
}
101+
require.NoError(t, err1)
102+
require.NoError(t, err2)
103+
require.Equal(t, n1, n2)
104+
require.Equal(t, b1, b2)
105+
}
104106
}

‎hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
olm.operatorframework.io/generator: experimental
88
name: clusterextensions.olm.operatorframework.io
99
spec:

‎hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
olm.operatorframework.io/generator: standard
88
name: clusterextensions.olm.operatorframework.io
99
spec:

0 commit comments

Comments
 (0)