Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-0.51] chore(ci): Use Go 1.23.5 to build images #2159

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:

env:
# Common versions
GO_VERSION: '1.21.2'
GOLANGCI_VERSION: 'v1.54.2'
GO_VERSION: '1.23.5'
GOLANGCI_VERSION: 'v1.63.4'
DOCKER_BUILDX_VERSION: 'v0.14.1'

# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/ec2/securitygroup_diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func getKey(perm ec2types.IpPermission) ruleKey {
}
}

type ipPermissionMap struct {
type ipPermissionMap struct { //nolint:recvcheck
FromPort *int32
ToPort *int32
IPProtocol *string
Expand Down Expand Up @@ -146,7 +146,7 @@ func (i ipPermissionMap) diffPrefixListIDs(other ipPermissionMap) []ec2types.Pre
return ret
}

func (i ipPermissionMap) diffUserIDGroupPair(other ipPermissionMap) []ec2types.UserIdGroupPair {
func (i *ipPermissionMap) diffUserIDGroupPair(other ipPermissionMap) []ec2types.UserIdGroupPair {
var ret []ec2types.UserIdGroupPair
for key, r := range i.groups {
r2, ok := other.groups[key]
Expand Down
4 changes: 1 addition & 3 deletions pkg/controller/mq/configuration/utils/xmlparse.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/google/go-cmp/cmp"
)

//nolint:musttag
type Node struct {
XMLName xml.Name
Attr []xml.Attr `xml:",any,attr"`
Expand All @@ -17,9 +16,8 @@ type Node struct {
}

func (n *Node) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
//nolint:musttag
type node Node
return d.DecodeElement((*node)(n), &start)
return d.DecodeElement((*node)(n), &start) //nolint:musttag
}

func DiffXMLConfigs(c1, c2 string) (string, error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/utils/pointer/pointer.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func ToIntAsInt32(v int) *int32 {
if v == 0 {
return nil
}
val32 := int32(v)
val32 := int32(v) //nolint:gosec
return &val32
}

Expand All @@ -73,7 +73,7 @@ func ToIntAsInt32Ptr(v *int) *int32 {
if v == nil {
return nil
}
val32 := int32(*v)
val32 := int32(*v) //nolint:gosec
return &val32
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/policy/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func (s *StringOrArray) UnmarshalJSON(data []byte) error {
// StringOrSet is a string array that supports parsing from a single string
// as a single entry array. Order of elements is not respected when comparing
// two StringOrSet objects.
type StringOrSet map[string]struct{}
type StringOrSet map[string]struct{} //nolint:recvcheck

func NewStringOrSet(values ...string) StringOrSet {
set := make(StringOrSet, len(values))
Expand Down
Loading