Skip to content

Commit 6758dae

Browse files
oktalzoktalz
committed
BUILD/MINOR: ci: add newer lint image
1 parent 783a763 commit 6758dae

12 files changed

Lines changed: 27 additions & 32 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ golangci-lint:
3434
paths:
3535
- build
3636
image:
37-
name: $CI_REGISTRY_GO/lint:1.46.2
37+
name: $CI_REGISTRY_GO/lint:1.50.0
3838
entrypoint: [""]
3939
tags:
4040
- go
4141
script:
42-
- golangci-lint cache clean && go clean -modcache -cache -i
4342
- golangci-lint run --timeout 5m --color always --max-issues-per-linter 0 --max-same-issues 0
4443
rules:
4544
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'

‎configuration/cluster_sync.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"encoding/asn1"
2727
"encoding/pem"
2828
"fmt"
29-
"io/ioutil"
29+
"io"
3030
"net/http"
3131
"path"
3232
"strconv"
@@ -161,7 +161,7 @@ func (c *ClusterSync) issueRefreshRequest(url, port, basePath string, nodesPath
161161
}
162162
defer resp.Body.Close()
163163

164-
body, err := ioutil.ReadAll(resp.Body)
164+
body, err := io.ReadAll(resp.Body)
165165
if err != nil {
166166
return err
167167
}
@@ -371,7 +371,7 @@ func (c *ClusterSync) issueJoinRequest(url, port, basePath string, registerPath
371371
}
372372
defer resp.Body.Close()
373373

374-
body, err := ioutil.ReadAll(resp.Body)
374+
body, err := io.ReadAll(resp.Body)
375375
if err != nil {
376376
return err
377377
}
@@ -390,7 +390,7 @@ func (c *ClusterSync) issueJoinRequest(url, port, basePath string, registerPath
390390
return errCfg
391391
}
392392
// write id to file
393-
errFID := ioutil.WriteFile(c.cfg.HAProxy.NodeIDFile, []byte(responseData.ID), 0o644) // nolint:gosec
393+
errFID := renameio.WriteFile(c.cfg.HAProxy.NodeIDFile, []byte(responseData.ID), 0o644) // nolint:gosec
394394
if errFID != nil {
395395
return errFID
396396
}
@@ -519,7 +519,7 @@ func (c *ClusterSync) fetchCert() {
519519
c.activateFetchCert(err)
520520
break
521521
}
522-
body, err := ioutil.ReadAll(resp.Body)
522+
body, err := io.ReadAll(resp.Body)
523523
resp.Body.Close()
524524
if err != nil {
525525
c.activateFetchCert(err)

‎configuration/converter/converter.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
66
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
7+
// http://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
//
1514
package main
1615

1716
import (

‎configuration/file-storage-hcl.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ package configuration
1818
import (
1919
"bytes"
2020
"encoding/gob"
21-
"io/ioutil"
21+
"os"
2222
"strings"
2323

24+
"github.com/google/renameio"
2425
"github.com/haproxytech/dataplaneapi/log"
2526
"github.com/hashicorp/hcl"
2627
"github.com/rodaine/hclencoder"
@@ -36,7 +37,7 @@ func (s *StorageHCL) Load(filename string) error {
3637
cfg := &StorageDataplaneAPIConfiguration{}
3738
var hclFile []byte
3839
var err error
39-
hclFile, err = ioutil.ReadFile(filename)
40+
hclFile, err = os.ReadFile(filename)
4041
if err != nil {
4142
return err
4243
}
@@ -102,7 +103,7 @@ func (s *StorageHCL) SaveAs(filename string) error {
102103
return err
103104
}
104105

105-
return ioutil.WriteFile(filename, hcl, 0644) //nolint:gosec
106+
return renameio.WriteFile(filename, hcl, 0o644) //nolint:gosec
106107
}
107108

108109
func (s *StorageHCL) Save() error {

‎configuration/file-storage-yml.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package configuration
1717

1818
import (
19-
"io/ioutil"
19+
"os"
2020

2121
"github.com/google/renameio"
2222
"gopkg.in/yaml.v2"
@@ -32,7 +32,7 @@ func (s *StorageYML) Load(filename string) error {
3232
cfg := &StorageDataplaneAPIConfiguration{}
3333
var err error
3434

35-
yamlFile, err := ioutil.ReadFile(filename)
35+
yamlFile, err := os.ReadFile(filename)
3636
if err != nil {
3737
return err
3838
}
@@ -62,7 +62,7 @@ func (s *StorageYML) SaveAs(filename string) error {
6262
return err
6363
}
6464

65-
return renameio.WriteFile(filename, data, 0644)
65+
return renameio.WriteFile(filename, data, 0o644)
6666
}
6767

6868
func (s *StorageYML) Save() error {

‎configuration/pid.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package configuration
1717

1818
import (
1919
"fmt"
20-
"io/ioutil"
2120
"os"
2221
"strconv"
2322

@@ -31,7 +30,7 @@ func HandlePIDFile(haproxyOptions HAProxyConfiguration) {
3130
}
3231

3332
if fileExists(haproxyOptions.PIDFile) {
34-
data, err := ioutil.ReadFile(haproxyOptions.PIDFile)
33+
data, err := os.ReadFile(haproxyOptions.PIDFile)
3534
if err != nil {
3635
log.Fatalf("error while reading PID file content: %v", err)
3736
}
@@ -48,7 +47,7 @@ func HandlePIDFile(haproxyOptions HAProxyConfiguration) {
4847
}
4948
}
5049

51-
err := renameio.WriteFile(haproxyOptions.PIDFile, []byte(fmt.Sprintf("%d", os.Getpid())), 0644)
50+
err := renameio.WriteFile(haproxyOptions.PIDFile, []byte(fmt.Sprintf("%d", os.Getpid())), 0o644)
5251
if err != nil {
5352
log.Fatalf("error while writing PID file: %s %s", haproxyOptions.PIDFile, err.Error())
5453
} else {

‎configuration/watcher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"crypto/md5"
2121
"fmt"
22-
"io/ioutil"
22+
"os"
2323
"path/filepath"
2424
"strings"
2525

@@ -97,7 +97,7 @@ func (w *ConfigWatcher) checkFlags(event fsnotify.Event) bool {
9797
}
9898

9999
func (w *ConfigWatcher) invalidHash() bool {
100-
content, err := ioutil.ReadFile(w.configFile)
100+
content, err := os.ReadFile(w.configFile)
101101
if err != nil {
102102
log.Warningf("Watcher: error reading config file: %s", err.Error())
103103
return false

‎generate/go-generate.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
66
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
7+
// http://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
//
1514
package main
1615

1716
import (
1817
"errors"
1918
"fmt"
20-
"io/ioutil"
2119
"log"
2220
"os"
2321
"os/exec"
@@ -118,7 +116,7 @@ type ParseData struct {
118116

119117
func readServerData(filePath string, pd *ParseData, structName string, attName string, groupName string, isList bool) {
120118
typeStruct := fmt.Sprintf("type %s struct {", structName)
121-
dat, err := ioutil.ReadFile(filePath)
119+
dat, err := os.ReadFile(filePath)
122120
if err != nil {
123121
log.Panic(err)
124122
}

‎handlers/general_storage.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (h *StorageCreateStorageGeneralFileHandlerImpl) Handle(params storage.Creat
6464
return storage.NewCreateStorageGeneralFileCreated().WithPayload(me)
6565
}
6666

67-
// StorageGetAllStorageGeneralFilesHandlerImpl implementation of the StorageGetAllStorageGeneralFilesHandler interface
67+
// StorageGetAllStorageGeneralFilesHandlerImpl implementation of the StorageGetAllStorageGeneralFilesHandler interface
6868
type StorageGetAllStorageGeneralFilesHandlerImpl struct {
6969
Client client_native.HAProxyClient
7070
}

‎haproxy/reload_agent.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"bytes"
2020
"context"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323
"os"
2424
"os/exec"
2525
"path/filepath"
@@ -524,7 +524,7 @@ func copyFile(src, dest string) error {
524524
}
525525
defer srcContent.Close()
526526

527-
data, err := ioutil.ReadAll(srcContent)
527+
data, err := io.ReadAll(srcContent)
528528
if err != nil {
529529
return err
530530
}

0 commit comments

Comments
 (0)