Skip to content

Commit 7f0597e

Browse files
metal3dmetal3d
committed
Sonar complience
Use valid names and factorize some constants checks
1 parent b6d9b4d commit 7f0597e

8 files changed

+37
-36
lines changed

‎generator/configMap_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
os.Chdir(tmpDir)
2525
defer os.Chdir(currentDir)
2626

27-
output := _compile_test(t, "-s", "templates/web/configmap.yaml")
27+
output := internalCompileTest(t, "-s", "templates/web/configmap.yaml")
2828
configMap := v1.ConfigMap{}
2929
if err := yaml.Unmarshal([]byte(output), &configMap); err != nil {
3030
t.Errorf(unmarshalError, err)

‎generator/cronJob_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
os.Chdir(tmpDir)
3131
defer os.Chdir(currentDir)
3232

33-
output := _compile_test(t, "-s", "templates/cron/cronjob.yaml")
33+
output := internalCompileTest(t, "-s", "templates/cron/cronjob.yaml")
3434
cronJob := batchv1.CronJob{}
3535
if err := yaml.Unmarshal([]byte(output), &cronJob); err != nil {
3636
t.Errorf(unmarshalError, err)
@@ -83,7 +83,7 @@ services:
8383
os.Chdir(tmpDir)
8484
defer os.Chdir(currentDir)
8585

86-
output := _compile_test(t, "-s", "templates/cron/cronjob.yaml")
86+
output := internalCompileTest(t, "-s", "templates/cron/cronjob.yaml")
8787
cronJob := batchv1.CronJob{}
8888
if err := yaml.Unmarshal([]byte(output), &cronJob); err != nil {
8989
t.Errorf(unmarshalError, err)

‎generator/deployment_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
os.Chdir(tmpDir)
2626
defer os.Chdir(currentDir)
2727

28-
output := _compile_test(t, "-s", webTemplateOutput)
28+
output := internalCompileTest(t, "-s", webTemplateOutput)
2929

3030
// dt := DeploymentTest{}
3131
dt := v1.Deployment{}
@@ -67,7 +67,7 @@ services:
6767
os.Chdir(tmpDir)
6868
defer os.Chdir(currentDir)
6969

70-
output := _compile_test(t, "-s", webTemplateOutput)
70+
output := internalCompileTest(t, "-s", webTemplateOutput)
7171
dt := v1.Deployment{}
7272
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
7373
t.Errorf(unmarshalError, err)
@@ -125,7 +125,7 @@ services:
125125
os.Chdir(tmpDir)
126126
defer os.Chdir(currentDir)
127127

128-
output := _compile_test(t, "-s", webTemplateOutput)
128+
output := internalCompileTest(t, "-s", webTemplateOutput)
129129
dt := v1.Deployment{}
130130
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
131131
t.Errorf(unmarshalError, err)
@@ -167,7 +167,7 @@ services:
167167
os.Chdir(tmpDir)
168168
defer os.Chdir(currentDir)
169169

170-
output := _compile_test(t, "-s", webTemplateOutput)
170+
output := internalCompileTest(t, "-s", webTemplateOutput)
171171
dt := v1.Deployment{}
172172
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
173173
t.Errorf(unmarshalError, err)
@@ -220,7 +220,7 @@ services:
220220
os.Chdir(tmpDir)
221221
defer os.Chdir(currentDir)
222222

223-
output := _compile_test(t, "-s", webTemplateOutput)
223+
output := internalCompileTest(t, "-s", webTemplateOutput)
224224
dt := v1.Deployment{}
225225
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
226226
t.Errorf(unmarshalError, err)
@@ -257,7 +257,7 @@ services:
257257
os.Chdir(tmpDir)
258258
defer os.Chdir(currentDir)
259259

260-
output := _compile_test(t, "-s", webTemplateOutput)
260+
output := internalCompileTest(t, "-s", webTemplateOutput)
261261
dt := v1.Deployment{}
262262
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
263263
t.Errorf(unmarshalError, err)
@@ -303,7 +303,7 @@ services:
303303
os.Chdir(tmpDir)
304304
defer os.Chdir(currentDir)
305305

306-
output := _compile_test(t, "-s", webTemplateOutput)
306+
output := internalCompileTest(t, "-s", webTemplateOutput)
307307
dt := v1.Deployment{}
308308
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
309309
t.Errorf(unmarshalError, err)

‎generator/ingress_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
os.Chdir(tmpDir)
3131
defer os.Chdir(currentDir)
3232

33-
output := _compile_test(t, "-s", "templates/web/ingress.yaml", "--set", "web.ingress.enabled=true")
33+
output := internalCompileTest(t, "-s", "templates/web/ingress.yaml", "--set", "web.ingress.enabled=true")
3434
ingress := v1.Ingress{}
3535
if err := yaml.Unmarshal([]byte(output), &ingress); err != nil {
3636
t.Errorf(unmarshalError, err)

‎generator/secret_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
os.Chdir(tmpDir)
3030
defer os.Chdir(currentDir)
3131

32-
output := _compile_test(t, "-s", "templates/web/secret.yaml")
32+
output := internalCompileTest(t, "-s", "templates/web/secret.yaml")
3333
secret := v1.Secret{}
3434
if err := yaml.Unmarshal([]byte(output), &secret); err != nil {
3535
t.Errorf(unmarshalError, err)

‎generator/service_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
os.Chdir(tmpDir)
2525
defer os.Chdir(currentDir)
2626

27-
output := _compile_test(t, "-s", "templates/web/service.yaml")
27+
output := internalCompileTest(t, "-s", "templates/web/service.yaml")
2828
service := v1.Service{}
2929
if err := yaml.Unmarshal([]byte(output), &service); err != nil {
3030
t.Errorf(unmarshalError, err)

‎generator/tools_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package generator
22

33
import (
4+
"katenary/parser"
45
"log"
56
"os"
67
"os/exec"
78
"testing"
8-
9-
"katenary/parser"
109
)
1110

1211
const unmarshalError = "Failed to unmarshal the output: %s"
@@ -29,8 +28,8 @@ func teardown(tmpDir string) {
2928
}
3029
}
3130

32-
func _compile_test(t *testing.T, options ...string) string {
33-
_, err := parser.Parse(nil, "compose.yml")
31+
func internalCompileTest(t *testing.T, options ...string) string {
32+
_, err := parser.Parse(nil, nil, "compose.yml")
3433
if err != nil {
3534
t.Fatalf("Failed to parse the project: %s", err)
3635
}

‎generator/volume_test.go

+21-19
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ import (
1010
"sigs.k8s.io/yaml"
1111
)
1212

13+
const htmlContent = "<html><body><h1>Hello, World!</h1></body></html>"
14+
1315
func TestGenerateWithBoundVolume(t *testing.T) {
14-
compose_file := `
16+
composeFile := `
1517
services:
1618
web:
1719
image: nginx:1.29
@@ -20,14 +22,14 @@ services:
2022
volumes:
2123
data:
2224
`
23-
tmpDir := setup(compose_file)
25+
tmpDir := setup(composeFile)
2426
defer teardown(tmpDir)
2527

2628
currentDir, _ := os.Getwd()
2729
os.Chdir(tmpDir)
2830
defer os.Chdir(currentDir)
2931

30-
output := _compile_test(t, "-s", "templates/web/deployment.yaml")
32+
output := internalCompileTest(t, "-s", "templates/web/deployment.yaml")
3133

3234
dt := v1.Deployment{}
3335
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
@@ -40,7 +42,7 @@ volumes:
4042
}
4143

4244
func TestWithStaticFiles(t *testing.T) {
43-
compose_file := `
45+
composeFile := `
4446
services:
4547
web:
4648
image: nginx:1.29
@@ -50,8 +52,8 @@ services:
5052
%s/configmap-files: |-
5153
- ./static
5254
`
53-
compose_file = fmt.Sprintf(compose_file, katenaryLabelPrefix)
54-
tmpDir := setup(compose_file)
55+
composeFile = fmt.Sprintf(composeFile, katenaryLabelPrefix)
56+
tmpDir := setup(composeFile)
5557
defer teardown(tmpDir)
5658

5759
// create a static directory with an index.html file
@@ -61,14 +63,14 @@ services:
6163
if err != nil {
6264
t.Errorf("Failed to create index.html: %s", err)
6365
}
64-
indexFile.WriteString("<html><body><h1>Hello, World!</h1></body></html>")
66+
indexFile.WriteString(htmlContent)
6567
indexFile.Close()
6668

6769
currentDir, _ := os.Getwd()
6870
os.Chdir(tmpDir)
6971
defer os.Chdir(currentDir)
7072

71-
output := _compile_test(t, "-s", "templates/web/deployment.yaml")
73+
output := internalCompileTest(t, "-s", "templates/web/deployment.yaml")
7274
dt := v1.Deployment{}
7375
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
7476
t.Errorf(unmarshalError, err)
@@ -94,13 +96,13 @@ services:
9496
if len(data) != 1 {
9597
t.Errorf("Expected 1 data, got %d", len(data))
9698
}
97-
if data["index.html"] != "<html><body><h1>Hello, World!</h1></body></html>" {
98-
t.Errorf("Expected index.html to be <html><body><h1>Hello, World!</h1></body></html>, got %s", data["index.html"])
99+
if data["index.html"] != htmlContent {
100+
t.Errorf("Expected index.html to be "+htmlContent+", got %s", data["index.html"])
99101
}
100102
}
101103

102104
func TestWithFileMapping(t *testing.T) {
103-
compose_file := `
105+
composeFile := `
104106
services:
105107
web:
106108
image: nginx:1.29
@@ -110,8 +112,8 @@ services:
110112
%s/configmap-files: |-
111113
- ./static/index.html
112114
`
113-
compose_file = fmt.Sprintf(compose_file, katenaryLabelPrefix)
114-
tmpDir := setup(compose_file)
115+
composeFile = fmt.Sprintf(composeFile, katenaryLabelPrefix)
116+
tmpDir := setup(composeFile)
115117
defer teardown(tmpDir)
116118

117119
// create a static directory with an index.html file
@@ -121,14 +123,14 @@ services:
121123
if err != nil {
122124
t.Errorf("Failed to create index.html: %s", err)
123125
}
124-
indexFile.WriteString("<html><body><h1>Hello, World!</h1></body></html>")
126+
indexFile.WriteString(htmlContent)
125127
indexFile.Close()
126128

127129
currentDir, _ := os.Getwd()
128130
os.Chdir(tmpDir)
129131
defer os.Chdir(currentDir)
130132

131-
output := _compile_test(t, "-s", "templates/web/deployment.yaml")
133+
output := internalCompileTest(t, "-s", "templates/web/deployment.yaml")
132134
dt := v1.Deployment{}
133135
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
134136
t.Errorf(unmarshalError, err)
@@ -147,7 +149,7 @@ services:
147149
}
148150

149151
func TestBindFrom(t *testing.T) {
150-
compose_file := `
152+
composeFile := `
151153
services:
152154
web:
153155
image: nginx:1.29
@@ -167,15 +169,15 @@ volumes:
167169
data:
168170
`
169171

170-
compose_file = fmt.Sprintf(compose_file, katenaryLabelPrefix)
171-
tmpDir := setup(compose_file)
172+
composeFile = fmt.Sprintf(composeFile, katenaryLabelPrefix)
173+
tmpDir := setup(composeFile)
172174
defer teardown(tmpDir)
173175

174176
currentDir, _ := os.Getwd()
175177
os.Chdir(tmpDir)
176178
defer os.Chdir(currentDir)
177179

178-
output := _compile_test(t, "-s", "templates/web/deployment.yaml")
180+
output := internalCompileTest(t, "-s", "templates/web/deployment.yaml")
179181
dt := v1.Deployment{}
180182
if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
181183
t.Errorf(unmarshalError, err)

0 commit comments

Comments
 (0)