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.

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

Adjust vet and gosec complaints #548

Merged
merged 3 commits into from
Feb 8, 2023
Merged

Adjust vet and gosec complaints #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c7f973
Add tags to 'make vet' command
Feb 6, 2023
ae690bc
Fix gosec complaints about unsafe defer statements
Feb 6, 2023
aec21d2
Add debugging code to gosec installation
Feb 6, 2023
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ testnsxv:
# any common errors.
vet:
@echo "==> Running Go Vet"
@go vet ./... ; if [ $$? -ne 0 ] ; then echo "vet error!" ; exit 1 ; fi
@go vet -tags ALL ./... ; if [ $$? -ne 0 ] ; then echo "vet error!" ; exit 1 ; fi

# static runs the source code static analysis tool `staticcheck`
static: fmtcheck
Expand Down
34 changes: 17 additions & 17 deletions govcd/access_control_catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
IsSharedToEveryone: false,
EveryoneAccessLevel: nil,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
&types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[0].user.User.Href,
Name: users[0].user.User.Name,
Expand Down Expand Up @@ -199,8 +199,8 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
IsSharedToEveryone: false,
EveryoneAccessLevel: nil,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
&types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[0].user.User.Href,
//Name: users[0].user.User.Name, // Pass info without name for one of the subjects
Expand All @@ -209,7 +209,7 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
ExternalSubject: nil,
AccessLevel: types.ControlAccessReadOnly,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[1].user.User.Href,
Name: users[1].user.User.Name,
Expand All @@ -234,8 +234,8 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
IsSharedToEveryone: false,
EveryoneAccessLevel: nil,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
&types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[0].user.User.Href,
Name: users[0].user.User.Name,
Expand All @@ -244,7 +244,7 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
ExternalSubject: nil,
AccessLevel: types.ControlAccessReadOnly,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[1].user.User.Href,
//Name: users[1].user.User.Name,// Pass info without name for one of the subjects
Expand All @@ -253,7 +253,7 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
ExternalSubject: nil,
AccessLevel: types.ControlAccessFullControl,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[2].user.User.Href,
Name: users[2].user.User.Name,
Expand All @@ -275,8 +275,8 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
IsSharedToEveryone: false,
EveryoneAccessLevel: nil,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
&types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[0].user.User.Href,
Name: users[0].user.User.Name,
Expand All @@ -285,7 +285,7 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
ExternalSubject: nil,
AccessLevel: types.ControlAccessReadOnly,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[1].user.User.Href,
//Name: users[1].user.User.Name,// Pass info without name for one of the subjects
Expand All @@ -294,7 +294,7 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
ExternalSubject: nil,
AccessLevel: types.ControlAccessFullControl,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[2].user.User.Href,
Name: users[2].user.User.Name,
Expand All @@ -303,7 +303,7 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
ExternalSubject: nil,
AccessLevel: types.ControlAccessReadWrite,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: newOrg.AdminOrg.HREF,
Name: newOrg.AdminOrg.Name,
Expand All @@ -327,8 +327,8 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
IsSharedToEveryone: false,
EveryoneAccessLevel: nil,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
&types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: adminOrg.AdminOrg.HREF,
Name: adminOrg.AdminOrg.Name,
Expand All @@ -337,7 +337,7 @@ func (vcd *TestVCD) testCatalogAccessControl(adminOrg *AdminOrg, catalog accessC
ExternalSubject: nil,
AccessLevel: types.ControlAccessFullControl,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: newOrg.AdminOrg.HREF,
Name: newOrg.AdminOrg.Name,
Expand Down
18 changes: 9 additions & 9 deletions govcd/access_control_vapp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ func (vcd *TestVCD) Test_VappAccessControl(check *C) {
IsSharedToEveryone: false,
EveryoneAccessLevel: nil,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
&types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[0].user.User.Href,
Name: users[0].user.User.Name,
Expand Down Expand Up @@ -151,8 +151,8 @@ func (vcd *TestVCD) Test_VappAccessControl(check *C) {
IsSharedToEveryone: false,
EveryoneAccessLevel: nil,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
&types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[0].user.User.Href,
//Name: users[0].user.User.Name, // Pass info without name for one of the subjects
Expand All @@ -161,7 +161,7 @@ func (vcd *TestVCD) Test_VappAccessControl(check *C) {
ExternalSubject: nil,
AccessLevel: types.ControlAccessReadOnly,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[1].user.User.Href,
Name: users[1].user.User.Name,
Expand All @@ -186,8 +186,8 @@ func (vcd *TestVCD) Test_VappAccessControl(check *C) {
IsSharedToEveryone: false,
EveryoneAccessLevel: nil,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
&types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[0].user.User.Href,
Name: users[0].user.User.Name,
Expand All @@ -196,7 +196,7 @@ func (vcd *TestVCD) Test_VappAccessControl(check *C) {
ExternalSubject: nil,
AccessLevel: types.ControlAccessReadOnly,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[1].user.User.Href,
//Name: users[1].user.User.Name,// Pass info without name for one of the subjects
Expand All @@ -205,7 +205,7 @@ func (vcd *TestVCD) Test_VappAccessControl(check *C) {
ExternalSubject: nil,
AccessLevel: types.ControlAccessFullControl,
},
&types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: users[2].user.User.Href,
Name: users[2].user.User.Name,
Expand Down
8 changes: 7 additions & 1 deletion govcd/api_vcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package govcd
import (
"crypto/tls"
"fmt"
"io"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -91,7 +92,12 @@ func (vcdClient *VCDClient) vcdCloudApiAuthorize(user, pass, org string) (*http.
return nil, err
}

defer resp.Body.Close()
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
util.Logger.Printf("error closing response Body [vcdCloudApiAuthorize]: %s", err)
}
}(resp.Body)

// Catch HTTP 401 (Status Unauthorized) to return an error as otherwise this library would return
// odd errors while doing lookup of resources and confuse user.
Expand Down
14 changes: 12 additions & 2 deletions govcd/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,12 @@ func createItemForUpload(client *Client, createHREF *url.URL, catalogItemName st
if err != nil {
return nil, err
}
defer response.Body.Close()
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
util.Logger.Printf("error closing response Body [createItemForUpload]: %s", err)
}
}(response.Body)

catalogItemParsed := &types.CatalogItem{}
if err = decodeBody(types.BodyTypeXML, response, catalogItemParsed); err != nil {
Expand Down Expand Up @@ -651,7 +656,12 @@ func createItemWithLink(client *Client, createHREF *url.URL, catalogItemName, it
if err != nil {
return nil, err
}
defer response.Body.Close()
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
util.Logger.Printf("error closing response Body [createItemWithLink]: %s", err)
}
}(response.Body)

catalogItemParsed := &types.CatalogItem{}
if err = decodeBody(types.BodyTypeXML, response, catalogItemParsed); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion govcd/catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@ func (vcd *TestVCD) Test_CatalogAccessAsOrgUsers(check *C) {
err = adminCatalog1AsSystem.SetAccessControl(&types.ControlAccessParams{
IsSharedToEveryone: false,
AccessSettings: &types.AccessSettingList{
[]*types.AccessSetting{
AccessSetting: []*types.AccessSetting{
{
Subject: &types.LocalSubject{
HREF: org2.Org.HREF,
Expand Down
8 changes: 7 additions & 1 deletion govcd/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ package govcd
import (
"errors"
"fmt"
"github.com/vmware/go-vcloud-director/v2/util"
"io"
"net/http"
"net/url"
Expand Down Expand Up @@ -171,7 +172,12 @@ func testGetEdgeEndpointXML(endpoint string, edge EdgeGateway, check *C) string
fmt.Sprintf("unable to get XML from endpoint %s: %%s", endpoint), nil, &types.NSXError{})
check.Assert(err, IsNil)

defer resp.Body.Close()
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
util.Logger.Printf("error closing response Body [testGetEdgeEndpointXML]: %s", err)
}
}(resp.Body)

body, err := io.ReadAll(resp.Body)
check.Assert(err, IsNil)
Expand Down
6 changes: 3 additions & 3 deletions govcd/external_network_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ func testExternalNetworkV2(vcd *TestVCD, name, backingType, backingId, NetworkPr
ID: "",
Name: name,
Description: "",
Subnets: types.ExternalNetworkV2Subnets{[]types.ExternalNetworkV2Subnet{
Subnets: types.ExternalNetworkV2Subnets{Values: []types.ExternalNetworkV2Subnet{
{
Gateway: "1.1.1.1",
PrefixLength: 24,
DNSSuffix: "",
DNSServer1: "",
DNSServer2: "",
IPRanges: types.ExternalNetworkV2IPRanges{[]types.ExternalNetworkV2IPRange{
IPRanges: types.ExternalNetworkV2IPRanges{Values: []types.ExternalNetworkV2IPRange{
{
StartAddress: "1.1.1.3",
EndAddress: "1.1.1.50",
Expand All @@ -170,7 +170,7 @@ func testExternalNetworkV2(vcd *TestVCD, name, backingType, backingId, NetworkPr
TotalIPCount: 0,
},
}},
NetworkBackings: types.ExternalNetworkV2Backings{[]types.ExternalNetworkV2Backing{
NetworkBackings: types.ExternalNetworkV2Backings{Values: []types.ExternalNetworkV2Backing{
{
BackingID: backingId,
NetworkProvider: types.NetworkProvider{
Expand Down
7 changes: 6 additions & 1 deletion govcd/media.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,12 @@ func createMedia(client *Client, link, mediaName, mediaDescription string, fileS
if err != nil {
return nil, err
}
defer response.Body.Close()
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
util.Logger.Printf("error closing response Body [createMedia]: %s", err)
}
}(response.Body)

mediaForUpload := &types.Media{}
if err = decodeBody(types.BodyTypeXML, response, mediaForUpload); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions govcd/nsxt_firewall_group_dynamic_security_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (vcd *TestVCD) Test_NsxtDynamicSecurityGroup(check *C) {
OwnerRef: &types.OpenApiReference{ID: vdcGroup.VdcGroup.Id},
VmCriteria: []types.NsxtFirewallGroupVmCriteria{
{
[]types.NsxtFirewallGroupVmCriteriaRule{
VmCriteriaRule: []types.NsxtFirewallGroupVmCriteriaRule{
{
AttributeType: "VM_TAG",
Operator: "EQUALS",
Expand All @@ -53,7 +53,7 @@ func (vcd *TestVCD) Test_NsxtDynamicSecurityGroup(check *C) {
},
}, // Boolean OR
{
[]types.NsxtFirewallGroupVmCriteriaRule{
VmCriteriaRule: []types.NsxtFirewallGroupVmCriteriaRule{
{
AttributeType: "VM_NAME",
Operator: "CONTAINS",
Expand Down
8 changes: 7 additions & 1 deletion govcd/nsxt_importable_switch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package govcd

import (
"fmt"
"io"
"net/http"
"net/url"

Expand Down Expand Up @@ -192,7 +193,12 @@ func getFilteredNsxtImportableSwitches(filter map[string]string, client *Client)
if err != nil {
return nil, err
}
defer response.Body.Close()
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
util.Logger.Printf("error closing response Body [getFilteredNsxtImportableSwitches]: %s", err)
}
}(response.Body)

var nsxtImportableSwitches []*types.NsxtImportableSwitch
if err = decodeBody(types.BodyTypeJSON, response, &nsxtImportableSwitches); err != nil {
Expand Down
10 changes: 9 additions & 1 deletion scripts/gosec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,19 @@ function get_gosec {
echo "'curl' executable not found - Skipping gosec"
exit 0
fi
$curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh
$curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh > gosec_install.sh
exit_code=$?
if [ "$exit_code" != "0" ]
then
echo "Error downloading gosec installer"
exit $exit_code
fi
sh -x gosec_install.sh > gosec_install.log 2>&1
exit_code=$?
if [ "$exit_code" != "0" ]
then
echo "Error installing gosec"
cat gosec_install.log
exit $exit_code
fi
gosec=$PWD/bin/gosec
Expand Down