diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c9b25d4..75a6713 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,6 +43,6 @@ jobs: cache: true - name: golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v9 with: version: latest diff --git a/internal/client/group_membership.go b/internal/client/group_membership.go index 88c88a9..d89b7de 100644 --- a/internal/client/group_membership.go +++ b/internal/client/group_membership.go @@ -96,7 +96,7 @@ func (c *Client) GetGroup(groupID string) (*GetGroupData, error) { if err != nil { return nil, fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) @@ -143,7 +143,7 @@ func (c *Client) CreateGroupMembership(groupID, userID, roleID string) (membersh if err != nil { return "", fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() respBody, _ := io.ReadAll(resp.Body) if resp.StatusCode == http.StatusConflict { @@ -190,16 +190,16 @@ func (c *Client) ListGroupMemberships(groupID string) ([]ListGroupMembershipItem if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("list group memberships: status %d: %s", resp.StatusCode, string(body)) } var out ListGroupMembershipsResponse if err := json.NewDecoder(resp.Body).Decode(&out); err != nil { - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("decode response: %w", err) } - resp.Body.Close() + _ = resp.Body.Close() all = append(all, out.Data...) if out.Links == nil || out.Links.Next == "" { @@ -227,16 +227,16 @@ func (c *Client) GetGroupMembershipByID(groupID, membershipID string) (*ListGrou if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("list group memberships: status %d: %s", resp.StatusCode, string(body)) } var out ListGroupMembershipsResponse if err := json.NewDecoder(resp.Body).Decode(&out); err != nil { - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("decode response: %w", err) } - resp.Body.Close() + _ = resp.Body.Close() for i := range out.Data { if out.Data[i].ID == membershipID { @@ -273,16 +273,16 @@ func (c *Client) getGroupMembershipIDOfUser(groupID, userID string) (string, err if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) - resp.Body.Close() + _ = resp.Body.Close() return "", fmt.Errorf("list group memberships: status %d: %s", resp.StatusCode, string(body)) } var out ListGroupMembershipsResponse if err := json.NewDecoder(resp.Body).Decode(&out); err != nil { - resp.Body.Close() + _ = resp.Body.Close() return "", fmt.Errorf("decode response: %w", err) } - resp.Body.Close() + _ = resp.Body.Close() if len(out.Data) > 0 { return out.Data[0].ID, nil @@ -323,7 +323,7 @@ func (c *Client) UpdateGroupMembership(groupID, membershipID, roleID string) err if err != nil { return fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() respBody, _ := io.ReadAll(resp.Body) if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNoContent { @@ -351,7 +351,7 @@ func (c *Client) DeleteGroupMembership(groupID, membershipID string, cascade boo if err != nil { return fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() if resp.StatusCode != http.StatusNoContent && resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) diff --git a/internal/client/group_orgs.go b/internal/client/group_orgs.go index cd16d17..6f44b9d 100644 --- a/internal/client/group_orgs.go +++ b/internal/client/group_orgs.go @@ -40,16 +40,16 @@ func (c *Client) ListGroupOrgs(groupID string) ([]OrgItem, error) { if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("list group orgs: status %d: %s", resp.StatusCode, string(body)) } var out ListGroupOrgsResponse if err := json.NewDecoder(resp.Body).Decode(&out); err != nil { - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("decode response: %w", err) } - resp.Body.Close() + _ = resp.Body.Close() all = append(all, out.Data...) if out.Links == nil || out.Links.Next == "" { diff --git a/internal/client/group_roles.go b/internal/client/group_roles.go index 66da534..b8d85b9 100644 --- a/internal/client/group_roles.go +++ b/internal/client/group_roles.go @@ -30,7 +30,7 @@ func (c *Client) ListGroupRolesV1(groupID string) ([]RoleItem, error) { if err != nil { return nil, fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) diff --git a/internal/client/org_membership.go b/internal/client/org_membership.go index ceef871..0d2145f 100644 --- a/internal/client/org_membership.go +++ b/internal/client/org_membership.go @@ -95,7 +95,7 @@ func (c *Client) CreateOrgMembership(orgID, userID, roleID string) (membershipID if err != nil { return "", fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() respBody, _ := io.ReadAll(resp.Body) if resp.StatusCode != http.StatusCreated { @@ -129,16 +129,16 @@ func (c *Client) ListOrgMemberships(orgID string) ([]ListOrgMembershipItem, erro if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("list org memberships: status %d: %s", resp.StatusCode, string(body)) } var out ListOrgMembershipsResponse if err := json.NewDecoder(resp.Body).Decode(&out); err != nil { - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("decode response: %w", err) } - resp.Body.Close() + _ = resp.Body.Close() all = append(all, out.Data...) if out.Links == nil || out.Links.Next == "" { @@ -166,16 +166,16 @@ func (c *Client) GetOrgMembershipByID(orgID, membershipID string) (*ListOrgMembe if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("list org memberships: status %d: %s", resp.StatusCode, string(body)) } var out ListOrgMembershipsResponse if err := json.NewDecoder(resp.Body).Decode(&out); err != nil { - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("decode response: %w", err) } - resp.Body.Close() + _ = resp.Body.Close() for i := range out.Data { if out.Data[i].ID == membershipID { @@ -204,7 +204,7 @@ func (c *Client) DeleteOrgMembership(orgID, membershipID string) error { if err != nil { return fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() if resp.StatusCode != http.StatusNoContent && resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) @@ -242,7 +242,7 @@ func (c *Client) UpdateOrgMembership(orgID, membershipID, roleID string) error { if err != nil { return fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() respBody, _ := io.ReadAll(resp.Body) if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNoContent { diff --git a/internal/client/sso.go b/internal/client/sso.go index dee6684..6d9c60e 100644 --- a/internal/client/sso.go +++ b/internal/client/sso.go @@ -48,7 +48,7 @@ func (c *Client) ListGroupSSOConnections(groupID string) ([]SSOConnectionItem, e if err != nil { return nil, fmt.Errorf("request: %w", err) } - defer resp.Body.Close() + defer func() { _ = resp.Body.Close() }() if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) @@ -81,16 +81,16 @@ func (c *Client) ListGroupSSOConnectionUsers(groupID, ssoID string) ([]SSOConnec if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("list group SSO connection users: status %d: %s", resp.StatusCode, string(body)) } var out ListGroupSSOConnectionUsersResponse if err := json.NewDecoder(resp.Body).Decode(&out); err != nil { - resp.Body.Close() + _ = resp.Body.Close() return nil, fmt.Errorf("decode response: %w", err) } - resp.Body.Close() + _ = resp.Body.Close() all = append(all, out.Data...) if out.Links == nil || out.Links.Next == "" { diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go index 4498c9a..a736eb6 100644 --- a/internal/provider/provider_test.go +++ b/internal/provider/provider_test.go @@ -14,7 +14,7 @@ func TestNew(t *testing.T) { if p == nil { t.Fatal("nil provider") } - var _ tfprovider.Provider = p + var _ = p } func TestSnykIdentityProvider_Metadata(t *testing.T) {