Skip to content

[v13] chore: Bump golangci-lint to v1.56.0 #37877

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.

Sign up for GitHub

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

Merged
codingllama merged 1 commit into from
Feb 7, 2024
Merged

[v13] chore: Bump golangci-lint to v1.56.0 #37877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
image: ghcr.io/gravitational/teleport-buildbox:teleport13

env:
GOLANGCI_LINT_VERSION: v1.55.2
GOLANGCI_LINT_VERSION: v1.56.0

steps:
- name: Checkout
Expand Down
28 changes: 15 additions & 13 deletions api/types/cluster_alert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,38 +122,38 @@ func TestAlertAcknowledgement_Check(t *testing.T) {
expires := time.Now().Add(5 * time.Minute)

testcases := []struct {
desc string
ack *AlertAcknowledgement
expectedErr error
desc string
ack *AlertAcknowledgement
wantErr bool
}{
{
desc: "empty",
ack: &AlertAcknowledgement{},
expectedErr: &trace.BadParameterError{},
desc: "empty",
ack: &AlertAcknowledgement{},
wantErr: true,
},
{
desc: "missing reason",
ack: &AlertAcknowledgement{
AlertID: "alert-id",
Expires: expires,
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "missing alert ID",
ack: &AlertAcknowledgement{
Expires: expires,
Reason: "some reason",
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "missing expiry",
ack: &AlertAcknowledgement{
AlertID: "alert-id",
Reason: "some reason",
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "success",
Expand All @@ -162,20 +162,22 @@ func TestAlertAcknowledgement_Check(t *testing.T) {
Expires: expires,
Reason: "some reason",
},
expectedErr: nil,
},
}

for _, tc := range testcases {
t.Run(tc.desc, func(t *testing.T) {
err := tc.ack.Check()

if tc.expectedErr == nil {
require.Equal(t, err, nil)
if !tc.wantErr {
require.NoError(t, err)
return
}

require.ErrorAs(t, err, &tc.expectedErr)
require.Error(t, err)
require.True(t,
trace.IsBadParameter(err),
"want BadParameter, got %v (%T)", err, trace.Unwrap(err))
})
}
}
2 changes: 1 addition & 1 deletion api/types/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestIntegrationJSONMarshalCycle(t *testing.T) {
err = json.Unmarshal(bs, &ig2)
require.NoError(t, err)

require.Equal(t, ig, &ig2)
require.Equal(t, &ig2, ig)
}

func TestIntegrationCheckAndSetDefaults(t *testing.T) {
Expand Down
70 changes: 37 additions & 33 deletions api/types/provisioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ import (

func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
testcases := []struct {
desc string
token *ProvisionTokenV2
expected *ProvisionTokenV2
expectedErr error
desc string
token *ProvisionTokenV2
expected *ProvisionTokenV2
wantErr bool
}{
{
desc: "empty",
token: &ProvisionTokenV2{},
expectedErr: &trace.BadParameterError{},
desc: "empty",
token: &ProvisionTokenV2{},
wantErr: true,
},
{
desc: "missing roles",
Expand All @@ -45,7 +45,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
Name: "test",
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "invalid role",
Expand All @@ -57,7 +57,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
Roles: []SystemRole{RoleNode, "not a role"},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "simple token",
Expand Down Expand Up @@ -158,7 +158,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
JoinMethod: "ec2",
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "ec2 method with aws_arn",
Expand All @@ -177,7 +177,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "ec2 method empty rule",
Expand All @@ -191,7 +191,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
Allow: []*TokenRule{{}},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "iam method",
Expand Down Expand Up @@ -237,7 +237,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "iam method with aws_regions",
Expand All @@ -256,7 +256,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "github valid",
Expand Down Expand Up @@ -316,7 +316,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "circleci valid",
Expand Down Expand Up @@ -353,7 +353,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "circleci and no org id",
Expand All @@ -373,7 +373,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "circleci allow rule blank",
Expand All @@ -391,7 +391,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "kubernetes: in_cluster defaults",
Expand Down Expand Up @@ -494,7 +494,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "kubernetes: missing static_jwks.jwks",
Expand All @@ -516,7 +516,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "kubernetes: wrong service account name",
Expand All @@ -536,7 +536,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "kubernetes: allow rule blank",
Expand All @@ -554,7 +554,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "gitlab empty allow rules",
Expand All @@ -570,7 +570,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "gitlab missing config",
Expand All @@ -584,7 +584,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
GitLab: nil,
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "gitlab empty allow rule",
Expand All @@ -602,7 +602,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "gitlab defaults",
Expand Down Expand Up @@ -702,7 +702,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "spacelift",
Expand Down Expand Up @@ -759,7 +759,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "spacelift rule missing fields",
Expand All @@ -776,7 +776,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "spacelift missing hostname",
Expand All @@ -796,7 +796,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "spacelift incorrect hostname",
Expand All @@ -817,7 +817,7 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
{
desc: "gcp method",
Expand Down Expand Up @@ -877,18 +877,22 @@ func TestProvisionTokenV2_CheckAndSetDefaults(t *testing.T) {
},
},
},
expectedErr: &trace.BadParameterError{},
wantErr: true,
},
}

for _, tc := range testcases {
t.Run(tc.desc, func(t *testing.T) {
err := tc.token.CheckAndSetDefaults()
if tc.expectedErr != nil {
require.ErrorAs(t, err, &tc.expectedErr)
if tc.wantErr {
require.Error(t, err)
require.True(t,
trace.IsBadParameter(err),
"want BadParameter, got %v (%T)", err, trace.Unwrap(err))
return
}
require.NoError(t, err)

if tc.expected != nil {
require.Equal(t, tc.expected, tc.token)
}
Expand Down
2 changes: 1 addition & 1 deletion build.assets/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ RUN go install github.com/google/addlicense@v1.0.0
RUN go install github.com/daixiang0/gci@v0.12.1

# Install golangci-lint.
RUN VERSION='v1.55.2'; \
RUN VERSION='v1.56.0'; \
curl -fsSL "https://raw.githubusercontent.com/golangci/golangci-lint/$VERSION/install.sh" | \
sh -s -- -b "$(go env GOPATH)/bin" "$VERSION"

Expand Down
Loading