Skip to content

Commit 26412fb

Browse files
oktalzoktalz
committed
CLEANUP/MINOR: do not use naked returns
1 parent 335465c commit 26412fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+237
-237
lines changed

‎deploy/tests/e2e/client.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ func (c *Client) DoMethod(method string) (res *http.Response, closeFunc func() e
129129
c.Req.Method = method
130130
res, err = client.Do(c.Req)
131131
if err != nil {
132-
return
132+
return res, closeFunc, err
133133
}
134134
closeFunc = res.Body.Close
135-
return
135+
return res, closeFunc, err
136136
}
137137

138138
func (c *Client) Do() (res *http.Response, closeFunc func() error, err error) {
@@ -178,12 +178,12 @@ func ProxyProtoConn() (result []byte, err error) {
178178

179179
_, err = header.WriteTo(conn)
180180
if err != nil {
181-
return
181+
return result, err
182182
}
183183

184184
_, err = conn.Write([]byte("HEAD / HTTP/1.0\r\n\r\n"))
185185
if err != nil {
186-
return
186+
return result, err
187187
}
188188

189189
return io.ReadAll(conn)
@@ -196,23 +196,23 @@ func runtimeCommand(command string) (result []byte, err error) {
196196
}
197197
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", kindURL, STATS_PORT))
198198
if err != nil {
199-
return
199+
return result, err
200200
}
201201
_, err = conn.Write([]byte(command + "\n"))
202202
if err != nil {
203-
return
203+
return result, err
204204
}
205205
result = make([]byte, 2048)
206206
_, err = conn.Read(result)
207207
conn.Close()
208-
return
208+
return result, err
209209
}
210210

211211
func GetHAProxyMapCount(mapName string) (count int, err error) {
212212
var result []byte
213213
result, err = runtimeCommand("show map")
214214
if err != nil {
215-
return
215+
return count, err
216216
}
217217
scanner := bufio.NewScanner(bytes.NewReader(result))
218218
for scanner.Scan() {
@@ -225,14 +225,14 @@ func GetHAProxyMapCount(mapName string) (count int, err error) {
225225
break
226226
}
227227
}
228-
return
228+
return count, err
229229
}
230230

231231
func GetGlobalHAProxyInfo() (info GlobalHAProxyInfo, err error) {
232232
var result []byte
233233
result, err = runtimeCommand("show info")
234234
if err != nil {
235-
return
235+
return info, err
236236
}
237237
scanner := bufio.NewScanner(bytes.NewReader(result))
238238
for scanner.Scan() {
@@ -246,7 +246,7 @@ func GetGlobalHAProxyInfo() (info GlobalHAProxyInfo, err error) {
246246
info.Pid = strings.Split(line, ": ")[1]
247247
}
248248
}
249-
return
249+
return info, err
250250
}
251251

252252
type CertInfo struct {
@@ -259,7 +259,7 @@ func GetCertSubject(filename string) (certInfo CertInfo, err error) {
259259
var result []byte
260260
result, err = runtimeCommand("show ssl cert " + filename)
261261
if err != nil {
262-
return
262+
return certInfo, err
263263
}
264264
scanner := bufio.NewScanner(bytes.NewReader(result))
265265
for scanner.Scan() {
@@ -268,7 +268,7 @@ func GetCertSubject(filename string) (certInfo CertInfo, err error) {
268268
case strings.HasPrefix(line, "Used:"):
269269
used, convErr := strconv.ParseBool(strings.Split(line, ": ")[1])
270270
if convErr != nil {
271-
return //nolint:nilnesserr
271+
return certInfo, err //nolint:nilnesserr
272272
}
273273
certInfo.Used = used
274274
case strings.HasPrefix(line, "Subject:"):
@@ -277,5 +277,5 @@ func GetCertSubject(filename string) (certInfo CertInfo, err error) {
277277
certInfo.Issuer = strings.Split(line, ": ")[1]
278278
}
279279
}
280-
return
280+
return certInfo, err
281281
}

‎deploy/tests/e2e/endpoints/http_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ func (suite *EndpointsSuite) getPID() (pid string) {
8080
r, err := e2e.GetGlobalHAProxyInfo()
8181
if err != nil {
8282
suite.T().Log(err)
83-
return
83+
return pid
8484
}
8585
pid = r.Pid
86-
return
86+
return pid
8787
}

‎deploy/tests/integration/base-suite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ type updateStatusManager struct{}
7070

7171
func (m *updateStatusManager) AddIngress(ingress *ingress.Ingress) {}
7272
func (m *updateStatusManager) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
73-
return
73+
return err
7474
}
7575

7676
type TestController struct {

‎deploy/tests/tnr/routeacl/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type updateStatusManager struct{}
4141

4242
func (m *updateStatusManager) AddIngress(ingress *ingress.Ingress) {}
4343
func (m *updateStatusManager) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
44-
return
44+
return err
4545
}
4646

4747
func TestUseBackend(t *testing.T) {
@@ -206,5 +206,5 @@ func (suite *UseBackendSuite) UseBackendFixture() (eventChan chan k8ssync.SyncDa
206206
controllerHasWorked := make(chan struct{})
207207
eventChan <- k8ssync.SyncDataEvent{SyncType: k8ssync.COMMAND, EventProcessed: controllerHasWorked}
208208
<-controllerHasWorked
209-
return
209+
return eventChan
210210
}

‎deploy/tests/ut/acls/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type FakeUpdateSatusManager struct{}
4141

4242
func (m *FakeUpdateSatusManager) AddIngress(ingress *ingress.Ingress) {}
4343
func (m *FakeUpdateSatusManager) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
44-
return
44+
return err
4545
}
4646

4747
type ACLSuite struct {
@@ -207,5 +207,5 @@ func (suite *ACLSuite) UseACLFixture() (eventChan chan k8ssync.SyncDataEvent) {
207207
eventChan <- k8ssync.SyncDataEvent{SyncType: k8ssync.COMMAND}
208208
eventChan <- k8ssync.SyncDataEvent{EventProcessed: controllerHasWorked}
209209
<-controllerHasWorked
210-
return
210+
return eventChan
211211
}

‎deploy/tests/ut/httprequests/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type FakeUpdateSatusManager struct{}
4141

4242
func (m *FakeUpdateSatusManager) AddIngress(ingress *ingress.Ingress) {}
4343
func (m *FakeUpdateSatusManager) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
44-
return
44+
return err
4545
}
4646

4747
type HTTPRequestsSuite struct {
@@ -210,5 +210,5 @@ func (suite *HTTPRequestsSuite) UseHTTPRequestsFixture() (eventChan chan k8ssync
210210
eventChan <- k8ssync.SyncDataEvent{SyncType: k8ssync.COMMAND}
211211
eventChan <- k8ssync.SyncDataEvent{EventProcessed: controllerHasWorked}
212212
<-controllerHasWorked
213-
return
213+
return eventChan
214214
}

‎pkg/annotations/annotations.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -178,55 +178,55 @@ func SetDefaultValue(annotation, value string) {
178178
func Bool(name string, annotations ...map[string]string) (out bool, err error) {
179179
boolean, err := ParseBool(name, annotations...)
180180
out = boolean == "true"
181-
return
181+
return out, err
182182
}
183183

184184
func ParseBool(name string, annotations ...map[string]string) (out string, err error) {
185185
input := common.GetValue(name, annotations...)
186186
if input == "" {
187-
return
187+
return out, err
188188
}
189189
_, err = utils.GetBoolValue(input, name)
190190
if err != nil {
191191
err = fmt.Errorf("%s annotation: %w", name, err)
192-
return
192+
return out, err
193193
}
194194
out = input
195-
return
195+
return out, err
196196
}
197197

198198
func Int(name string, annotations ...map[string]string) (out int, err error) {
199199
input := common.GetValue(name, annotations...)
200200
if input == "" {
201-
return
201+
return out, err
202202
}
203203
out, err = strconv.Atoi(input)
204204
if err != nil {
205205
err = fmt.Errorf("annotation '%s': %w", name, err)
206-
return
206+
return out, err
207207
}
208-
return
208+
return out, err
209209
}
210210

211211
func Secret(name, defaultNs string, k store.K8s, annotations ...map[string]string) (secret *store.Secret, err error) {
212212
var secNs, secName string
213213
secNs, secName, err = common.GetK8sPath(name, annotations...)
214214
if err != nil {
215215
err = fmt.Errorf("annotation '%s': %w", name, err)
216-
return
216+
return secret, err
217217
}
218218
if secName == "" {
219-
return
219+
return secret, err
220220
}
221221
if secNs == "" {
222222
secNs = defaultNs
223223
}
224224
secret, err = k.GetSecret(secNs, secName)
225225
if err != nil {
226226
err = fmt.Errorf("annotation '%s': %w", name, err)
227-
return
227+
return secret, err
228228
}
229-
return
229+
return secret, err
230230
}
231231

232232
func String(name string, annotations ...map[string]string) string {
@@ -236,14 +236,14 @@ func String(name string, annotations ...map[string]string) string {
236236
func Timeout(name string, annotations ...map[string]string) (out *int64, err error) {
237237
input := common.GetValue(name, annotations...)
238238
if input == "" {
239-
return
239+
return out, err
240240
}
241241
out, err = utils.ParseTime(input)
242242
if err != nil {
243243
err = fmt.Errorf("annotation '%s': %w", name, err)
244-
return
244+
return out, err
245245
}
246-
return
246+
return out, err
247247
}
248248

249249
// SpecificAnnotations is a set of annotations that uses rules to produce specific configuration with rule ID in configuration file.

‎pkg/annotations/cfgSnippet.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,16 @@ func (a *CfgSnippet) Process(k store.K8s, annotations ...map[string]string) erro
226226
func UpdateGlobalCfgSnippet(api api.HAProxyClient) (updated []string, err error) {
227227
err = api.GlobalCfgSnippet(cfgSnippet.global.value)
228228
if err != nil {
229-
return
229+
return updated, err
230230
}
231231

232232
if len(cfgSnippet.global.updated) == 0 {
233-
return
233+
return updated, err
234234
}
235235

236236
updated = cfgSnippet.global.updated
237237
cfgSnippet.global.updated = nil
238-
return
238+
return updated, err
239239
}
240240

241241
func UpdateFrontendCfgSnippet(api api.HAProxyClient, frontends ...string) (updated []string, err error) {
@@ -247,7 +247,7 @@ func UpdateFrontendCfgSnippet(api api.HAProxyClient, frontends ...string) (updat
247247

248248
err = api.FrontendCfgSnippetSet(ft, data.value)
249249
if err != nil {
250-
return
250+
return updated, err
251251
}
252252

253253
if len(data.updated) == 0 {
@@ -258,27 +258,27 @@ func UpdateFrontendCfgSnippet(api api.HAProxyClient, frontends ...string) (updat
258258
data.updated = nil
259259
cfgSnippet.frontends[ft] = data
260260
}
261-
return
261+
return updated, err
262262
}
263263

264264
func CheckBackendConfigSnippetError(configErr error, cfgDir string) (rerun bool, err error) {
265265
// No error ? no configsnippet to disable.
266266
if configErr == nil {
267-
return
267+
return rerun, err
268268
}
269269
file, lineNumbers, err := processConfigurationError(configErr)
270270
if err != nil {
271-
return
271+
return rerun, err
272272
}
273273
// Read contents from failed configuration file
274274
file = filepath.Join(cfgDir, "failed", filepath.Base(file))
275275
contents, err := os.ReadFile(file)
276276
if err != nil {
277-
return
277+
return rerun, err
278278
}
279279

280280
rerun = disableFaultyCfgSnippet(string(contents), lineNumbers)
281-
return
281+
return rerun, err
282282
}
283283

284284
func RemoveBackendCfgSnippet(backend string) {
@@ -328,11 +328,11 @@ func getErrorLineNumberAndFileName(msg string) (lineNumber int, file string, err
328328
lineNumber = -1
329329
openSquareBracket := strings.Index(msg, "[")
330330
if openSquareBracket == -1 {
331-
return
331+
return lineNumber, file, err
332332
}
333333
closeSquareBracket := strings.Index(msg, "]")
334334
if closeSquareBracket == -1 {
335-
return
335+
return lineNumber, file, err
336336
}
337337
configsnippetComment := msg[openSquareBracket+1 : closeSquareBracket]
338338
fileLineNumber := strings.Split(configsnippetComment, ":")
@@ -341,12 +341,12 @@ func getErrorLineNumberAndFileName(msg string) (lineNumber int, file string, err
341341
file = fileLineNumber[0]
342342
lineNumber, err = strconv.Atoi(fileLineNumber[1])
343343
if err != nil {
344-
return
344+
return lineNumber, file, err
345345
}
346346
} else {
347347
err = fmt.Errorf("invalid config snippet information : '%s'", configsnippetComment)
348348
}
349-
return
349+
return lineNumber, file, err
350350
}
351351

352352
func disableFaultyCfgSnippet(contents string, lineNumbers []int) (rerun bool) {
@@ -405,7 +405,7 @@ func disableFaultyCfgSnippet(contents string, lineNumbers []int) (rerun bool) {
405405
rerun = true
406406
}
407407
}
408-
return
408+
return rerun
409409
}
410410

411411
func processConfigurationError(configErr error) (file string, lineNumbers []int, err error) {
@@ -423,8 +423,8 @@ func processConfigurationError(configErr error) (file string, lineNumbers []int,
423423
}
424424
lineNumbers = append(lineNumbers, lineNumber)
425425
} else if err != nil {
426-
return
426+
return file, lineNumbers, err
427427
}
428428
}
429-
return
429+
return file, lineNumbers, err
430430
}

‎pkg/annotations/common/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func GetValue(annotationName string, annotations ...map[string]string) string {
1919
func GetK8sPath(annotationName string, annotations ...map[string]string) (ns, name string, err error) {
2020
a := GetValue(annotationName, annotations...)
2121
if a == "" {
22-
return
22+
return ns, name, err
2323
}
2424
parts := strings.Split(a, "/")
2525
switch len(parts) {
@@ -35,7 +35,7 @@ func GetK8sPath(annotationName string, annotations ...map[string]string) (ns, na
3535
if name == "" {
3636
err = errors.New("invalid format")
3737
}
38-
return
38+
return ns, name, err
3939
}
4040

4141
var DefaultValues = map[string]string{

0 commit comments

Comments
 (0)