Skip to content

Commit 624d1d4

Browse files
feat(revert): keep useful changes
1 parent a80a1c7 commit 624d1d4

File tree

4 files changed

+47
-17
lines changed

4 files changed

+47
-17
lines changed

.github/workflows/push_pr.yml

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v3
2323
- uses: newrelic/newrelic-infra-checkers@v1
24-
- name: Semgrep
25-
uses: returntocorp/semgrep-action@v1
26-
with:
27-
auditOn: push
2824
- name: golangci-lint
2925
uses: golangci/golangci-lint-action@v2
3026
continue-on-error: ${{ github.event_name != 'pull_request' }}

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ module github.com/newrelic/nri-vsphere
33
go 1.19
44

55
require (
6-
github.com/newrelic/infra-integrations-sdk v3.7.3+incompatible
6+
github.com/newrelic/infra-integrations-sdk v3.8.0+incompatible
77
github.com/sirupsen/logrus v1.9.3
88
github.com/stretchr/testify v1.8.4
9-
github.com/vmware/govmomi v0.32.0
9+
github.com/vmware/govmomi v0.34.2
1010
github.com/xeipuuv/gojsonschema v1.2.0
1111
gopkg.in/yaml.v2 v2.4.0
1212
)
1313

1414
require (
1515
github.com/davecgh/go-spew v1.1.1 // indirect
16-
github.com/google/uuid v1.3.1 // indirect
16+
github.com/google/uuid v1.4.0 // indirect
1717
github.com/pkg/errors v0.9.1 // indirect
1818
github.com/pmezard/go-difflib v1.0.0 // indirect
1919
github.com/rogpeppe/go-internal v1.11.0 // indirect

go.sum

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
5-
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
6-
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
4+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
5+
github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
6+
github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
77
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
88
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
9-
github.com/newrelic/infra-integrations-sdk v3.7.3+incompatible h1:+o/MxTzFsC3BRVKpkw1pXer9Nja2mxWNbV9GfH7iKBc=
10-
github.com/newrelic/infra-integrations-sdk v3.7.3+incompatible/go.mod h1:tMUHRMq6mJS0YyBnbWrTXAnREnQqC1AGO6Lu45u5xAM=
9+
github.com/newrelic/infra-integrations-sdk v3.8.0+incompatible h1:QvwHLsgHyGw4ZULOSnnWQnVPE744K1eda+2XLp2eHtg=
10+
github.com/newrelic/infra-integrations-sdk v3.8.0+incompatible/go.mod h1:tMUHRMq6mJS0YyBnbWrTXAnREnQqC1AGO6Lu45u5xAM=
1111
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
1212
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
1313
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -21,8 +21,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
2121
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2222
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
2323
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
24-
github.com/vmware/govmomi v0.32.0 h1:Rsdi/HAX5Ebf9Byp/FvBir4sfM7yP5DBUeRlbC6vLBo=
25-
github.com/vmware/govmomi v0.32.0/go.mod h1:JA63Pg0SgQcSjk+LuPzjh3rJdcWBo/ZNCIwbb1qf2/0=
24+
github.com/vmware/govmomi v0.34.2 h1:o6ydkTVITOkpQU6HAf6tP5GvHFCNJlNUNlMsvFK77X4=
25+
github.com/vmware/govmomi v0.34.2/go.mod h1:qWWT6n9mdCr/T9vySsoUqcI04sSEj4CqHXxtk/Y+Los=
2626
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
2727
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
2828
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=

internal/process/testdata/vm.go

+37-3
Original file line numberDiff line numberDiff line change
@@ -1088,10 +1088,44 @@ const vmData = `
10881088
"GuestId": "",
10891089
"GuestFamily": "",
10901090
"GuestFullName": "",
1091-
"HostName": "",
1091+
"HostName": "vm-3",
10921092
"IpAddress": "",
10931093
"Net": null,
1094-
"IpStack": null,
1094+
"ipStack": [
1095+
{
1096+
"dnsConfig": {
1097+
"dhcp": false,
1098+
"hostName": "vm-3",
1099+
"domainName": "test.com",
1100+
"ipAddress": [
1101+
"10.2.192.2",
1102+
"127.0.0.53"
1103+
],
1104+
"searchDomain": [
1105+
"test.com"
1106+
]
1107+
},
1108+
"ipRouteConfig": {
1109+
"ipRoute": [
1110+
{
1111+
"network": "0.0.0.0",
1112+
"prefixLength": 0,
1113+
"gateway": {
1114+
"ipAddress": "10.2.192.1",
1115+
"device": "0"
1116+
}
1117+
},
1118+
{
1119+
"network": "10.2.192.0",
1120+
"prefixLength": 19,
1121+
"gateway": {
1122+
"device": "0"
1123+
}
1124+
}
1125+
]
1126+
}
1127+
}
1128+
],
10951129
"Disk": null,
10961130
"Screen": {
10971131
"Width": 1024,
@@ -1386,7 +1420,7 @@ const vmData = `
13861420
"ToolsVersionStatus": "guestToolsNotInstalled",
13871421
"ToolsVersionStatus2": "guestToolsNotInstalled",
13881422
"ToolsRunningStatus": "guestToolsNotRunning",
1389-
"HostName": "",
1423+
"HostName": "vm-3",
13901424
"IpAddress": "",
13911425
"HwVersion": "vmx-14"
13921426
},

0 commit comments

Comments
 (0)